Sync mathcore to fix lists

artcompiler · Aug 20, 2020 · 926345a · 926345a
1 parent cac7f6a
commit 926345a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/config-local.json b/config-local.json
@@ -1,6 +1,6 @@
 {
   "sympyHost": "localhost",
-  "sympyPort": "5000",
+  "sympyPort": "8000",
   "sympyProtocol": "http",
   "sympyPath": "/api/v1/eval"
 }
diff --git a/src/mathcore.js b/src/mathcore.js
@@ -15038,7 +15038,8 @@ __webpack_require__.r(__webpack_exports__);
         'Content-Length': encodedData.length
       },
     };
-    var req = https__WEBPACK_IMPORTED_MODULE_5___default.a.request(options, function(res) {
+    var protocol = config.sympyProtocol === "http" && http__WEBPACK_IMPORTED_MODULE_6___default.a || https__WEBPACK_IMPORTED_MODULE_5___default.a;
+    var req = protocol.request(options, function(res) {
       var data = "";
       res.on('data', function (chunk) {
         data += chunk;
@@ -18976,7 +18977,7 @@ let Model = (function () {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sympyRules", function() { return sympyRules; });
-var sympyRules={"words":{"\\infty":"oo","\\pi":"pi","e":"E","i":"I","\\emptyset":"EmptySet()","S":"_S","$":"_dollar"},"types":{"integerPosNeg":["(\\type{integerPosNeg})","\\type{integer}","-\\type{integer}"],"integerExpr":["\\type{integerPosNeg}","(\\type{integerExpr})","\\type{integerExpr}\\times\\type{integerExpr}","\\type{integerExpr}+\\type{integerExpr}","\\type{integerExpr}-\\type{integerExpr}","\\type{integerExpr}^\\type{integerExpr}"],"commonFraction":["\\frac{\\type{integer}}{2}","\\frac{\\type{integer}}{3}","\\frac{\\type{integer}}{4}","\\frac{\\type{integer}}{5}","\\frac{\\type{integer}}{6}","\\frac{\\type{integer}}{7}","\\frac{\\type{integer}}{8}","\\frac{\\type{integer}}{9}","\\frac{\\type{integer}}{10}"],"simpleExpression":["\\type{commonFraction}","\\type{number}","-\\type{number}","-\\type{variable}","\\type{variable}","\\type{variable}\\type{variable}","\\type{number}\\type{variable}"],"matrix":["\\begin{bmatrix}?&?&?\\end{bmatrix}"],"indexiSum":["\\sum_{i=?}^? ?"]},"rules":{"\\operatorname{CALC}?":["%2"],"\\operatorname{REL}?":["%2"],"\\operatorname{MATRIX}?":["simplify(%2)"],"\\operatorname{INTERVAL}?":["%2"],"\\operatorname{NUM}?":["N(expand(%2, complex=True))"],"\\operatorname{TRIG}?":["expand(factor(TR6(together(TR2(TR1(trigsimp(TR22(%2), method='fu')))))),frac=True, max_degree=10)"],"\\operatorname{HYPER}?":["expand(factor(trigsimp(%2)), max_degree=10)"],"\\operatorname{LOG}?":["expand(factor(%2), max_degree=10)"],"\\operatorname{EXPO}?":["expand(factor(simplify(%2)), max_degree=10)"],"\\operatorname{DEFAULT}?":["expand(factor(%2), max_degree=10)"],"\\mathbb{N}":["Naturals"],"\\mathbb{Z}":["Integers"],"\\mathbb{R}":["Reals"],"\\mathbb{C}":["Complexes"],"(?,?]":[{"%1":{"?,?":"Interval.Lopen(%1,%2)"}}],"[?,?)":[{"%1":{"?,?":"Interval.Ropen(%1,%2)"}}],"[?]":[{"(%1)":{"?,?":"Interval(%1,%2)"}}],"\\{?\\}":["FiniteSet(%1)"],"?\\cup?":[{"Union(%1,%2)":{"(?)":{"%1":{"?,?":"Interval.open(%1,%2)"}}}}],"?\\cap?":[{"Intersection(%1,%2)":{"(?)":{"%1":{"?,?":"Interval.open(%1,%2)"}}}}],"?\\backslash?":[{"Complement(%1,%2)":{"(?)":{"%1":{"?,?":"Interval.open(%1,%2)"}}}}],"\\ln{?}":["ln(factor(%2))"],"\\log{?}":["log(factor(%2),%1)"],"\\log_?{?}":["log(factor(%2),%1)"],"\\type{matrix}":[{"Matrix([%1])":{"\\type{row}":"[%*],","\\type{column}":"%*,"}}],"\\frac{d^?}{d?^?}?":["Derivative(%1, (%2,%3))"],"\\int \\int ? d? d?":["Integral %1 %2 %3"],"\\int_?^? ? d?":["Integral(%3,(%4,%1,%2))"],"\\int ? d?":["Integral(%1,%2)"],"\\lim_? ?":[{"Limit(%2, %1, '+-')":{"? \\rightarrow ?":"%1, %2","? \\to ?":"%1, %2","(?,?)":"(%1, %2)"}}],"\\type{indexiSum}":[{"summation(%3,(%1,%2))":{"i":"i","? = ?":{"%1,%2":{"i":"i"}}}}],"\\sum_?^? ?":[{"summation(%3,(%1,%2))":{"? = ?":"%1,%2"}}],"\\sin{?}":["sin(%1)"],"\\cos{?}":["cos(%1)"],"\\tan{?}":["tan(%1)"],"\\cot{?}":["cot(%1)"],"\\sec{?}":["sec(%1)"],"\\csc{?}":["csc(%1)"],"\\sin^{-1}{?}":["asin(%1)"],"\\cos^{-1}{?}":["acos(%1)"],"\\tan^{-1}{?}":["atan(%1)"],"\\cot^{-1}{?}":["acot(%1)"],"\\sec^{-1}{?}":["asec(%1)"],"\\csc^{-1}{?}":["acsc(%1)"],"\\sinh{?}":["sinh(%1)"],"\\cosh{?}":["cosh(%1)"],"\\tanh{?}":["tanh(%1)"],"\\coth{?}":["coth(%1)"],"\\sech{?}":["sech(%1)"],"\\csch{?}":["csch(%1)"],"\\sinh^{-1}{?}":["asinh(%1)"],"\\cosh^{-1}{?}":["acosh(%1)"],"\\tanh^{-1}{?}":["atanh(%1)"],"\\coth^{-1}{?}":["acoth(%1)"],"\\sech^{-1}{?}":["asech(%1)"],"\\csch^{-1}{?}":["acsch(%1)"],"\\type{repeatingDecimal}":[{"S('%1[%2]')":{"\\type{decimal}":"%1"}}],"\\type{decimal}":["Rational('%1')"],"?%":["(S(1)/100*%1)"],"?!":["factorial(%1)"],"\\frac{\\type{integerExpr}}{\\type{integerExpr}}":["(S(%1)/%2)"],"\\frac{?}{?}":["(%1/%2)"],"|?|":["Abs(%1)"],"\\abs{?}":["Abs(%1)"],"\\angle ?":["angle_%2%3%4"],"?\\degree":["rad(%1)"],"\\type{integerExpr}^\\type{integerExpr}":["S(%1)**%2"],"?^?":["factor(%1,deep=True)**%2"],"\\sqrt{?}":["sqrt(factor(%1))"],"\\sqrt[?]{?}":["real_root(factor(%1),%2)"],"-?":["-%1"],"?+?":["(%1+%2)"],"?-?":["(%1-%2)"],"?*?":["(%1*%2)"],"?\\cdot?":["(%1*%2)"],"\\type{integerExpr}\\div\\type{integerExpr}":["(S(%1)/%2)"],"?\\div?":["(%1/%2)"],"\\type{integerExpr}:\\type{integerExpr}":["(S(%1)/%2)"],"?:?":["(%1/%2)"],"?<?":["Lt(simplify(%1-%2),0,evaluate=False)"],"?\\nless?":["Ge(simplify(%1-%2),0,evaluate=False)"],"?\\le?":["Le(simplify(%1-%2),0,evaluate=False)"],"?>?":["Gt(simplify(%1-%2),0,evaluate=False)"],"?\\ge?":["Ge(simplify(%1-%2),0,evaluate=False)"],"?\\ngtr?":["Le(simplify(%1-%2),0,evaluate=False)"],"?=?":["Eq(simplify(%1-%2),0,evaluate=False)"],"?\\ne?":["Ne(simplify(%1-%2),0,evaluate=False)"],"?\\approx?":["Eq(simplify(%1-%2),0,evaluate=False)"],"?_?":[{"%1_%2":{"S":"S"}}],"(\\type{simpleExpression})":["%1"],"(?)":["(%1)"],"? ?":["(%1*%2)"],"?,?":["%1,%2"],"?":["%1"]}}
+var sympyRules={"words":{"\\infty":"oo","\\pi":"pi","e":"E","i":"I","\\emptyset":"EmptySet()","S":"_S","$":"_dollar"},"types":{"integerPosNeg":["(\\type{integerPosNeg})","\\type{integer}","-\\type{integer}"],"integerExpr":["\\type{integerPosNeg}","(\\type{integerExpr})","\\type{integerExpr}\\times\\type{integerExpr}","\\type{integerExpr}+\\type{integerExpr}","\\type{integerExpr}-\\type{integerExpr}","\\type{integerExpr}^\\type{integerExpr}"],"commonFraction":["\\frac{\\type{integer}}{2}","\\frac{\\type{integer}}{3}","\\frac{\\type{integer}}{4}","\\frac{\\type{integer}}{5}","\\frac{\\type{integer}}{6}","\\frac{\\type{integer}}{7}","\\frac{\\type{integer}}{8}","\\frac{\\type{integer}}{9}","\\frac{\\type{integer}}{10}"],"simpleExpression":["\\type{commonFraction}","\\type{number}","-\\type{number}","-\\type{variable}","\\type{variable}","\\type{variable}\\type{variable}","\\type{number}\\type{variable}"],"matrix":["\\begin{bmatrix}?&?&?\\end{bmatrix}"],"indexiSum":["\\sum_{i=?}^? ?"]},"rules":{"\\operatorname{CALC}?":["%2"],"\\operatorname{REL}?":["%2"],"\\operatorname{MATRIX}?":["simplify(%2)"],"\\operatorname{INTERVAL}?":["[%2]"],"\\operatorname{NUM}?":["N(expand(%2, complex=True))"],"\\operatorname{TRIG}?":["expand(factor(TR6(together(TR2(TR1(trigsimp(TR22(%2), method='fu')))))),frac=True, max_degree=10)"],"\\operatorname{HYPER}?":["expand(factor(trigsimp(%2)), max_degree=10)"],"\\operatorname{LOG}?":["expand(factor(%2), max_degree=10)"],"\\operatorname{EXPO}?":["expand(factor(simplify(%2)), max_degree=10)"],"\\operatorname{DEFAULT}?":["expand(factor(%2), max_degree=10)"],"\\mathbb{N}":["Naturals"],"\\mathbb{Z}":["Integers"],"\\mathbb{R}":["Reals"],"\\mathbb{C}":["Complexes"],"(?,?]":[{"%1":{"?,?":"Interval.Lopen(%1,%2)"}}],"[?,?)":[{"%1":{"?,?":"Interval.Ropen(%1,%2)"}}],"[?,?]":[{"%1":{"?,?":"Interval(%1,%2)"}}],"(?,?)":[{"%1":{"?,?":"Interval.open(%1,%2)"}}],"\\{?\\}":["FiniteSet(%1)"],"?\\cup?":[{"Union(%1,%2)":{"(?)":{"%1":{"?,?":"Interval.open(%1,%2)"}}}}],"?\\cap?":[{"Intersection(%1,%2)":{"(?)":{"%1":{"?,?":"Interval.open(%1,%2)"}}}}],"?\\backslash?":[{"Complement(%1,%2)":{"(?)":{"%1":{"?,?":"Interval.open(%1,%2)"}}}}],"\\ln{?}":["ln(factor(%2))"],"\\log{?}":["log(factor(%2),%1)"],"\\log_?{?}":["log(factor(%2),%1)"],"\\type{matrix}":[{"Matrix([%1])":{"\\type{row}":"[%*],","\\type{column}":"%*,"}}],"\\frac{d^?}{d?^?}?":["Derivative(%1, (%2,%3))"],"\\int \\int ? d? d?":["Integral %1 %2 %3"],"\\int_?^? ? d?":["Integral(%3,(%4,%1,%2))"],"\\int ? d?":["Integral(%1,%2)"],"\\lim_? ?":[{"Limit(%2, %1, '+-')":{"? \\rightarrow ?":"%1, %2","? \\to ?":"%1, %2","(?,?)":"(%1, %2)"}}],"\\type{indexiSum}":[{"summation(%3,(%1,%2))":{"i":"i","? = ?":{"%1,%2":{"i":"i"}}}}],"\\sum_?^? ?":[{"summation(%3,(%1,%2))":{"? = ?":"%1,%2"}}],"\\sin{?}":["sin(%1)"],"\\cos{?}":["cos(%1)"],"\\tan{?}":["tan(%1)"],"\\cot{?}":["cot(%1)"],"\\sec{?}":["sec(%1)"],"\\csc{?}":["csc(%1)"],"\\sin^{-1}{?}":["asin(%1)"],"\\cos^{-1}{?}":["acos(%1)"],"\\tan^{-1}{?}":["atan(%1)"],"\\cot^{-1}{?}":["acot(%1)"],"\\sec^{-1}{?}":["asec(%1)"],"\\csc^{-1}{?}":["acsc(%1)"],"\\sinh{?}":["sinh(%1)"],"\\cosh{?}":["cosh(%1)"],"\\tanh{?}":["tanh(%1)"],"\\coth{?}":["coth(%1)"],"\\sech{?}":["sech(%1)"],"\\csch{?}":["csch(%1)"],"\\sinh^{-1}{?}":["asinh(%1)"],"\\cosh^{-1}{?}":["acosh(%1)"],"\\tanh^{-1}{?}":["atanh(%1)"],"\\coth^{-1}{?}":["acoth(%1)"],"\\sech^{-1}{?}":["asech(%1)"],"\\csch^{-1}{?}":["acsch(%1)"],"\\type{repeatingDecimal}":[{"S('%1[%2]')":{"\\type{decimal}":"%1"}}],"\\type{decimal}":["Rational('%1')"],"?%":["(S(1)/100*%1)"],"?!":["factorial(%1)"],"\\frac{\\type{integerExpr}}{\\type{integerExpr}}":["(S(%1)/%2)"],"\\frac{?}{?}":["(%1/%2)"],"|?|":["Abs(%1)"],"\\abs{?}":["Abs(%1)"],"\\angle ?":["angle_%2%3%4"],"?\\degree":["rad(%1)"],"\\type{integerExpr}^\\type{integerExpr}":["S(%1)**%2"],"?^?":["factor(%1,deep=True)**%2"],"\\sqrt{?}":["sqrt(factor(%1))"],"\\sqrt[?]{?}":["real_root(factor(%1),%2)"],"-?":["-%1"],"?+?":["(%1+%2)"],"?-?":["(%1-%2)"],"?*?":["(%1*%2)"],"?\\cdot?":["(%1*%2)"],"\\type{integerExpr}\\div\\type{integerExpr}":["(S(%1)/%2)"],"?\\div?":["(%1/%2)"],"\\type{integerExpr}:\\type{integerExpr}":["(S(%1)/%2)"],"?:?":["(%1/%2)"],"?<?":["Lt(simplify(%1-%2),0,evaluate=False)"],"?\\nless?":["Ge(simplify(%1-%2),0,evaluate=False)"],"?\\le?":["Le(simplify(%1-%2),0,evaluate=False)"],"?>?":["Gt(simplify(%1-%2),0,evaluate=False)"],"?\\ge?":["Ge(simplify(%1-%2),0,evaluate=False)"],"?\\ngtr?":["Le(simplify(%1-%2),0,evaluate=False)"],"?=?":["Eq(simplify(%1-%2),0,evaluate=False)"],"?\\ne?":["Ne(simplify(%1-%2),0,evaluate=False)"],"?\\approx?":["Eq(simplify(%1-%2),0,evaluate=False)"],"?_?":[{"%1_%2":{"S":"S"}}],"(\\type{simpleExpression})":["%1"],"(?)":["(%1)"],"? ?":["(%1*%2)"],"?,?":["%1,%2"],"?":["%1"]}}
 
 /***/ }),
 

diff --git a/src/sympyRules.js b/src/sympyRules.js
diff --git a/tools/build.js b/tools/build.js
@@ -3,7 +3,7 @@ import {execSync} from 'child_process';
 
 // Current best rule sets
 const latexRulesID = "epLtg4YeVh5";
-const sympyRulesID = "o5riyRdYxHj";
+const sympyRulesID = "5bgtrgrOATz"; //"o5riyRdYxHj";
 const debug = true;
 function rmdir(path) {
   try { var files = fs.readdirSync(path); }