Skip to content

Commit 68a3df7

Browse files
utensilutensil
authored
Merge pull request #264 from eric-wieser/fix-Fmt
Fix some more str / latex mixups in the printer
2 parents 7c2c107 + 1da359d commit 68a3df7

File tree

7 files changed

+83
-86
lines changed

7 files changed

+83
-86
lines changed

‎examples/ipython/Old Format.ipynb‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,9 +1009,9 @@
10091009
"grad<b = (-D{y}b__xy - D{z}b__xz)*e_x + (D{x}b__xy - D{z}b__yz)*e_y + (D{x}b__xz + D{y}b__yz)*e_z\n",
10101010
"grad>b = 0 \n",
10111011
"\n",
1012-
"s*grad = \\boldsymbol{e}_{x}*s {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + \\boldsymbol{e}_{y}*s {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + \\boldsymbol{e}_{z}*s {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}\n",
1013-
"s^grad = \\boldsymbol{e}_{x}*s {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + \\boldsymbol{e}_{y}*s {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + \\boldsymbol{e}_{z}*s {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}\n",
1014-
"s<grad = \\boldsymbol{e}_{x}*s {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + \\boldsymbol{e}_{y}*s {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + \\boldsymbol{e}_{z}*s {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}\n",
1012+
"s*grad = e_x*s*D{x} + e_y*s*D{y} + e_z*s*D{z}\n",
1013+
"s^grad = e_x*s*D{x} + e_y*s*D{y} + e_z*s*D{z}\n",
1014+
"s<grad = e_x*s*D{x} + e_y*s*D{y} + e_z*s*D{z}\n",
10151015
"s>grad = 0 \n",
10161016
"s*s = s**2\n",
10171017
"s^s = s**2\n",
@@ -1026,11 +1026,11 @@
10261026
"s<b = b__xy*s*e_x^e_y + b__xz*s*e_x^e_z + b__yz*s*e_y^e_z\n",
10271027
"s>b = 0 \n",
10281028
"\n",
1029-
"v*grad = v^{x} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + v^{y} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + v^{z} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z} + \\boldsymbol{e}_{x}\\wedge \\boldsymbol{e}_{y}*(- v^{y} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + v^{x} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y}) + \\boldsymbol{e}_{x}\\wedge \\boldsymbol{e}_{z}*(- v^{z} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + v^{x} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}) + \\boldsymbol{e}_{y}\\wedge \\boldsymbol{e}_{z}*(- v^{z} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + v^{y} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z})\n",
1030-
"v^grad = \\boldsymbol{e}_{x}\\wedge \\boldsymbol{e}_{y}*(- v^{y} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + v^{x} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y}) + \\boldsymbol{e}_{x}\\wedge \\boldsymbol{e}_{z}*(- v^{z} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + v^{x} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}) + \\boldsymbol{e}_{y}\\wedge \\boldsymbol{e}_{z}*(- v^{z} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + v^{y} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z})\n",
1031-
"v|grad = v^{x} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + v^{y} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + v^{z} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}\n",
1032-
"v<grad = v^{x} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + v^{y} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + v^{z} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}\n",
1033-
"v>grad = v^{x} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + v^{y} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + v^{z} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}\n",
1029+
"v*grad = v__x*D{x} + v__y*D{y} + v__z*D{z} + e_x^e_y*(-v__y*D{x} + v__x*D{y}) + e_x^e_z*(-v__z*D{x} + v__x*D{z}) + e_y^e_z*(-v__z*D{y} + v__y*D{z})\n",
1030+
"v^grad = e_x^e_y*(-v__y*D{x} + v__x*D{y}) + e_x^e_z*(-v__z*D{x} + v__x*D{z}) + e_y^e_z*(-v__z*D{y} + v__y*D{z})\n",
1031+
"v|grad = v__x*D{x} + v__y*D{y} + v__z*D{z}\n",
1032+
"v<grad = v__x*D{x} + v__y*D{y} + v__z*D{z}\n",
1033+
"v>grad = v__x*D{x} + v__y*D{y} + v__z*D{z}\n",
10341034
"v*s = s*v__x*e_x + s*v__y*e_y + s*v__z*e_z\n",
10351035
"v^s = s*v__x*e_x + s*v__y*e_y + s*v__z*e_z\n",
10361036
"v<s = 0 \n",
@@ -1046,11 +1046,11 @@
10461046
"v<b = (-b__xy*v__y - b__xz*v__z)*e_x + (b__xy*v__x - b__yz*v__z)*e_y + (b__xz*v__x + b__yz*v__y)*e_z\n",
10471047
"v>b = 0 \n",
10481048
"\n",
1049-
"b*grad = \\boldsymbol{e}_{x}*(b^{xy} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + b^{xz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}) + \\boldsymbol{e}_{y}*(- b^{xy} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + b^{yz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}) + \\boldsymbol{e}_{z}*(- b^{xz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} - b^{yz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y}) + \\boldsymbol{e}_{x}\\wedge \\boldsymbol{e}_{y}\\wedge \\boldsymbol{e}_{z}*(b^{yz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} - b^{xz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + b^{xy} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z})\n",
1050-
"b^grad = \\boldsymbol{e}_{x}\\wedge \\boldsymbol{e}_{y}\\wedge \\boldsymbol{e}_{z}*(b^{yz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} - b^{xz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + b^{xy} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z})\n",
1051-
"b|grad = \\boldsymbol{e}_{x}*(b^{xy} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + b^{xz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}) + \\boldsymbol{e}_{y}*(- b^{xy} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + b^{yz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}) + \\boldsymbol{e}_{z}*(- b^{xz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} - b^{yz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y})\n",
1049+
"b*grad = e_x*(b__xy*D{y} + b__xz*D{z}) + e_y*(-b__xy*D{x} + b__yz*D{z}) + e_z*(-b__xz*D{x} - b__yz*D{y}) + e_x^e_y^e_z*(b__yz*D{x} - b__xz*D{y} + b__xy*D{z})\n",
1050+
"b^grad = e_x^e_y^e_z*(b__yz*D{x} - b__xz*D{y} + b__xy*D{z})\n",
1051+
"b|grad = e_x*(b__xy*D{y} + b__xz*D{z}) + e_y*(-b__xy*D{x} + b__yz*D{z}) + e_z*(-b__xz*D{x} - b__yz*D{y})\n",
10521052
"b<grad = 0 \n",
1053-
"b>grad = \\boldsymbol{e}_{x}*(b^{xy} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y} + b^{xz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}) + \\boldsymbol{e}_{y}*(- b^{xy} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} + b^{yz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial z}) + \\boldsymbol{e}_{z}*(- b^{xz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial x} - b^{yz} {\\left (x,y,z \\right )} \\frac{\\partial}{\\partial y})\n",
1053+
"b>grad = e_x*(b__xy*D{y} + b__xz*D{z}) + e_y*(-b__xy*D{x} + b__yz*D{z}) + e_z*(-b__xz*D{x} - b__yz*D{y})\n",
10541054
"b*s = b__xy*s*e_x^e_y + b__xz*s*e_x^e_z + b__yz*s*e_y^e_z\n",
10551055
"b^s = b__xy*s*e_x^e_y + b__xz*s*e_x^e_z + b__yz*s*e_y^e_z\n",
10561056
"b<s = 0 \n",
@@ -1082,9 +1082,9 @@
10821082
"grad<v = -(e_x.e_x)*(e_y.e_y)*D{x}v__x/(-(e_x.e_x)*(e_y.e_y) + (e_x.e_y)**2) - (e_x.e_x)*(e_y.e_y)*D{y}v__y/(-(e_x.e_x)*(e_y.e_y) + (e_x.e_y)**2) + (e_x.e_y)**2*D{x}v__x/(-(e_x.e_x)*(e_y.e_y) + (e_x.e_y)**2) + (e_x.e_y)**2*D{y}v__y/(-(e_x.e_x)*(e_y.e_y) + (e_x.e_y)**2)\n",
10831083
"grad>v = -(e_x.e_x)*(e_y.e_y)*D{x}v__x/(-(e_x.e_x)*(e_y.e_y) + (e_x.e_y)**2) - (e_x.e_x)*(e_y.e_y)*D{y}v__y/(-(e_x.e_x)*(e_y.e_y) + (e_x.e_y)**2) + (e_x.e_y)**2*D{x}v__x/(-(e_x.e_x)*(e_y.e_y) + (e_x.e_y)**2) + (e_x.e_y)**2*D{y}v__y/(-(e_x.e_x)*(e_y.e_y) + (e_x.e_y)**2)\n",
10841084
"\n",
1085-
"s*grad = \\boldsymbol{e}_{x}*(\\frac{\\left ( e_{y}\\cdot e_{y}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial x} - \\frac{\\left ( e_{x}\\cdot e_{y}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial y}) + \\boldsymbol{e}_{y}*(- \\frac{\\left ( e_{x}\\cdot e_{y}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial x} + \\frac{\\left ( e_{x}\\cdot e_{x}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial y})\n",
1086-
"s^grad = \\boldsymbol{e}_{x}*(\\frac{\\left ( e_{y}\\cdot e_{y}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial x} - \\frac{\\left ( e_{x}\\cdot e_{y}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial y}) + \\boldsymbol{e}_{y}*(- \\frac{\\left ( e_{x}\\cdot e_{y}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial x} + \\frac{\\left ( e_{x}\\cdot e_{x}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial y})\n",
1087-
"s<grad = \\boldsymbol{e}_{x}*(\\frac{\\left ( e_{y}\\cdot e_{y}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial x} - \\frac{\\left ( e_{x}\\cdot e_{y}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial y}) + \\boldsymbol{e}_{y}*(- \\frac{\\left ( e_{x}\\cdot e_{y}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial x} + \\frac{\\left ( e_{x}\\cdot e_{x}\\right ) s {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial y})\n",
1085+
"s*grad = e_x*((e_y.e_y)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{x} - (e_x.e_y)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{y}) + e_y*(-(e_x.e_y)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{x} + (e_x.e_x)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{y})\n",
1086+
"s^grad = e_x*((e_y.e_y)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{x} - (e_x.e_y)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{y}) + e_y*(-(e_x.e_y)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{x} + (e_x.e_x)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{y})\n",
1087+
"s<grad = e_x*((e_y.e_y)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{x} - (e_x.e_y)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{y}) + e_y*(-(e_x.e_y)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{x} + (e_x.e_x)*s/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{y})\n",
10881088
"s>grad = 0 \n",
10891089
"s*s = s**2\n",
10901090
"s^s = s**2\n",
@@ -1095,11 +1095,11 @@
10951095
"s<v = s*v__x*e_x + s*v__y*e_y\n",
10961096
"s>v = 0 \n",
10971097
"\n",
1098-
"v*grad = v^{x} {\\left (x,y \\right )} \\frac{\\partial}{\\partial x} + v^{y} {\\left (x,y \\right )} \\frac{\\partial}{\\partial y} + \\boldsymbol{e}_{x}\\wedge \\boldsymbol{e}_{y}*(- \\frac{\\left ( e_{x}\\cdot e_{y}\\right ) v^{x} {\\left (x,y \\right )} + \\left ( e_{y}\\cdot e_{y}\\right ) v^{y} {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial x} + \\frac{\\left ( e_{x}\\cdot e_{x}\\right ) v^{x} {\\left (x,y \\right )} + \\left ( e_{x}\\cdot e_{y}\\right ) v^{y} {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial y})\n",
1099-
"v^grad = \\boldsymbol{e}_{x}\\wedge \\boldsymbol{e}_{y}*(- \\frac{\\left ( e_{x}\\cdot e_{y}\\right ) v^{x} {\\left (x,y \\right )} + \\left ( e_{y}\\cdot e_{y}\\right ) v^{y} {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial x} + \\frac{\\left ( e_{x}\\cdot e_{x}\\right ) v^{x} {\\left (x,y \\right )} + \\left ( e_{x}\\cdot e_{y}\\right ) v^{y} {\\left (x,y \\right )}}{\\left ( e_{x}\\cdot e_{x}\\right ) \\left ( e_{y}\\cdot e_{y}\\right ) - \\left ( e_{x}\\cdot e_{y}\\right ) ^{2}} \\frac{\\partial}{\\partial y})\n",
1100-
"v|grad = v^{x} {\\left (x,y \\right )} \\frac{\\partial}{\\partial x} + v^{y} {\\left (x,y \\right )} \\frac{\\partial}{\\partial y}\n",
1101-
"v<grad = v^{x} {\\left (x,y \\right )} \\frac{\\partial}{\\partial x} + v^{y} {\\left (x,y \\right )} \\frac{\\partial}{\\partial y}\n",
1102-
"v>grad = v^{x} {\\left (x,y \\right )} \\frac{\\partial}{\\partial x} + v^{y} {\\left (x,y \\right )} \\frac{\\partial}{\\partial y}\n",
1098+
"v*grad = v__x*D{x} + v__y*D{y} + e_x^e_y*(-((e_x.e_y)*v__x + (e_y.e_y)*v__y)/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{x} + ((e_x.e_x)*v__x + (e_x.e_y)*v__y)/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{y})\n",
1099+
"v^grad = e_x^e_y*(-((e_x.e_y)*v__x + (e_y.e_y)*v__y)/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{x} + ((e_x.e_x)*v__x + (e_x.e_y)*v__y)/((e_x.e_x)*(e_y.e_y) - (e_x.e_y)**2)*D{y})\n",
1100+
"v|grad = v__x*D{x} + v__y*D{y}\n",
1101+
"v<grad = v__x*D{x} + v__y*D{y}\n",
1102+
"v>grad = v__x*D{x} + v__y*D{y}\n",
11031103
"v*s = s*v__x*e_x + s*v__y*e_y\n",
11041104
"v^s = s*v__x*e_x + s*v__y*e_y\n",
11051105
"v<s = 0 \n",
@@ -1477,8 +1477,8 @@
14771477
"grad^B = (r**2*\u001b[0;36mD{r}\u001b[0;31mB__thetaphi\u001b[0m\u001b[0m + 4*r*\u001b[0;31mB__thetaphi\u001b[0m - 2*\u001b[0;31mB__rphi\u001b[0m/tan(theta) - \u001b[0;36mD{theta}\u001b[0;31mB__rphi\u001b[0m\u001b[0m + \u001b[0;36mD{phi}\u001b[0;31mB__rtheta\u001b[0m\u001b[0m/sin(theta)**2)*\u001b[0;34me_r\u001b[0m^\u001b[0;34me_theta\u001b[0m^\u001b[0;34me_phi\u001b[0m/r**2\n",
14781478
"X = 1.2*\u001b[0;34me_x\u001b[0m + 2.34*\u001b[0;34me_y\u001b[0m + 0.555*\u001b[0;34me_z\u001b[0m\n",
14791479
"Nga(X,2) = 1.2*\u001b[0;34me_x\u001b[0m + 2.3*\u001b[0;34me_y\u001b[0m + 0.55*\u001b[0;34me_z\u001b[0m\n",
1480-
"X*Y = 12.7011000000000 + 4.02078*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_y\u001b[0m + 6.175185*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_z\u001b[0m + 10.182*\u001b[0;34me_y\u001b[0m^\u001b[0;34me_z\u001b[0m\n",
1481-
"Nga(X*Y,2) = 13. + 4.0*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_y\u001b[0m + 6.2*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_z\u001b[0m + 10.0*\u001b[0;34me_y\u001b[0m^\u001b[0;34me_z\u001b[0m\n",
1480+
"X*Y = 12.7011 + 4.02078*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_y\u001b[0m + 6.175185*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_z\u001b[0m + 10.182*\u001b[0;34me_y\u001b[0m^\u001b[0;34me_z\u001b[0m\n",
1481+
"Nga(X*Y,2) = 13.0 + 4.0*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_y\u001b[0m + 6.2*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_z\u001b[0m + 10.0*\u001b[0;34me_y\u001b[0m^\u001b[0;34me_z\u001b[0m\n",
14821482
"g_{ij} =\n",
14831483
" Matrix([\n",
14841484
"[1, 0, 0, 0, 0],\n",
@@ -1568,7 +1568,7 @@
15681568
"name": "python",
15691569
"nbconvert_exporter": "python",
15701570
"pygments_lexer": "ipython3",
1571-
"version": "3.7.2"
1571+
"version": "3.8.0"
15721572
}
15731573
},
15741574
"nbformat": 4,

‎examples/ipython/Terminal.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@
124124
"grad^B = (r*\u001b[0;36mD{r}\u001b[0;31mB__thetaphi\u001b[0m\u001b[0m - \u001b[0;31mB__rphi\u001b[0m/tan(theta) + 2*\u001b[0;31mB__thetaphi\u001b[0m - \u001b[0;36mD{theta}\u001b[0;31mB__rphi\u001b[0m\u001b[0m + \u001b[0;36mD{phi}\u001b[0;31mB__rtheta\u001b[0m\u001b[0m/sin(theta))*\u001b[0;34me_r\u001b[0m^\u001b[0;34me_theta\u001b[0m^\u001b[0;34me_phi\u001b[0m/r\n",
125125
"X = 1.2*\u001b[0;34me_x\u001b[0m + 2.34*\u001b[0;34me_y\u001b[0m + 0.555*\u001b[0;34me_z\u001b[0m\n",
126126
"Nga(X,2) = 1.2*\u001b[0;34me_x\u001b[0m + 2.3*\u001b[0;34me_y\u001b[0m + 0.55*\u001b[0;34me_z\u001b[0m\n",
127-
"X*Y = 12.7011000000000\n",
127+
"X*Y = 12.7011\n",
128128
" + 4.02078*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_y\u001b[0m + 6.175185*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_z\u001b[0m + 10.182*\u001b[0;34me_y\u001b[0m^\u001b[0;34me_z\u001b[0m\n",
129-
"Nga(X*Y,2) = 13.\n",
129+
"Nga(X*Y,2) = 13.0\n",
130130
" + 4.0*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_y\u001b[0m + 6.2*\u001b[0;34me_x\u001b[0m^\u001b[0;34me_z\u001b[0m + 10.0*\u001b[0;34me_y\u001b[0m^\u001b[0;34me_z\u001b[0m\n",
131131
"g_{ij} = Matrix([\n",
132132
"[ 0, (\u001b[0;34mX\u001b[0m.\u001b[0;34mY\u001b[0m), (\u001b[0;34mX\u001b[0m.\u001b[0;34me\u001b[0m)],\n",
@@ -743,7 +743,7 @@
743743
"name": "python",
744744
"nbconvert_exporter": "python",
745745
"pygments_lexer": "ipython3",
746-
"version": "3.7.2"
746+
"version": "3.8.0"
747747
}
748748
},
749749
"nbformat": 4,

‎galgebra/dop.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ def _with_sorted_terms(self):
116116
new_terms = sorted(self.terms, key=lambda term: Pdop.sort_key(term[1]))
117117
return Sdop(new_terms)
118118

119-
def Sdop_str(self):
119+
def Sdop_str(self, print_obj):
120120
if len(self.terms) == 0:
121121
return ZERO_STR
122122

123123
self = self._with_sorted_terms()
124124
s = ''
125125
for coef, pdop in self.terms:
126-
coef_str = printer.latex(coef)
127-
pd_str = printer.latex(pdop)
126+
coef_str = print_obj.doprint(coef)
127+
pd_str = print_obj.doprint(pdop)
128128

129129
if coef == S(1):
130130
s += pd_str
@@ -144,16 +144,16 @@ def Sdop_str(self):
144144
s = '(' + s + ')'
145145
return s
146146

147-
def Sdop_latex_str(self):
147+
def Sdop_latex_str(self, print_obj):
148148
if len(self.terms) == 0:
149149
return ZERO_STR
150150

151151
self = self._with_sorted_terms()
152152

153153
s = ''
154154
for coef, pdop in self.terms:
155-
coef_str = printer.latex(coef)
156-
pd_str = printer.latex(pdop)
155+
coef_str = print_obj.doprint(coef)
156+
pd_str = print_obj.doprint(pdop)
157157
if coef == S(1):
158158
if pd_str == '':
159159
s += '1'
@@ -378,31 +378,31 @@ def __rmul__(self, other): # functional product of arg and self (arg*self)
378378
assert not isinstance(other, Pdop)
379379
return Sdop([(other, self)])
380380

381-
def Pdop_str(self):
381+
def Pdop_str(self, print_obj):
382382
if self.order == 0:
383383
return 'D{}'
384384
s = 'D'
385385
for x in self.pdiffs:
386-
s += '{' + str(x) + '}'
386+
s += '{' + print_obj.doprint(x) + '}'
387387
n = self.pdiffs[x]
388388
if n > 1:
389-
s += '^' + str(n)
389+
s += '^' + print_obj.doprint(n)
390390
return s
391391

392-
def Pdop_latex_str(self):
392+
def Pdop_latex_str(self, print_obj):
393393
if self.order == 0:
394394
return ''
395395
s = r'\frac{\partial'
396396
if self.order > 1:
397-
s += '^{' + printer.latex(self.order) + '}'
397+
s += '^{' + print_obj.doprint(self.order) + '}'
398398
s += '}{'
399399
keys = list(self.pdiffs.keys())
400400
keys.sort(key=lambda x: x.sort_key())
401401
for key in keys:
402402
i = self.pdiffs[key]
403-
s += r'\partial ' + printer.latex(key)
403+
s += r'\partial ' + print_obj.doprint(key)
404404
if i > 1:
405-
s += '^{' + printer.latex(i) + '}'
405+
s += '^{' + print_obj.doprint(i) + '}'
406406
s += '}'
407407
return s
408408

0 commit comments

Comments
 (0)