Commit 7bea251d authored by Hynek Baran's avatar Hynek Baran

`resolve/nonlin/combine/2/pseudodivision` has to take arguments in proper order (polynoms degree)

parent c9da6e95
......@@ -117,7 +117,7 @@
</Input>
<Output>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets 5.92 test1 as of Oct 19, 2018 (2018-10-19 09:42:25)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets.newresolve v 0.3 as of Oct 2018 (2018-10-26 11:43:06)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets.newresolve v 0.3 as of Oct 2018 (2018-10-29 15:01:07)</Text-field>
</Output>
</Group>
<Group hide-output="false" labelreference="L936" drawlabel="true">
......
......@@ -146,7 +146,7 @@ read `../mc/Jets.s`;</Text-field>
</Output>
<Output>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets 5.92 test1 as of Oct 19, 2018 (2018-10-19 09:42:25)
Jets.newresolve v 0.3 as of Oct 2018 (2018-10-26 11:43:06)</Text-field>
Jets.newresolve v 0.3 as of Oct 2018 (2018-10-29 15:01:07)</Text-field>
</Output>
</Group>
<Group labelreference="L175" drawlabel="true">
......@@ -469,7 +469,7 @@ Jets.newresolve v 0.3 as of Oct 2018 (2018-10-26 11:43:06)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">[41] &lt;8&gt; Success!</Text-field>
</Output>
<Output>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">JCIlaCcpISIk</Equation></Text-field>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">JCIlWigpISIk</Equation></Text-field>
</Output>
</Group>
<Group hide-input="false" labelreference="L138" drawlabel="true">
......@@ -507,7 +507,7 @@ Jets.newresolve v 0.3 as of Oct 2018 (2018-10-26 11:43:06)</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">Z := (map(normal@simpl,Z));</Text-field>
</Input>
<Output>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output" display="LUklbXJvd0c2Iy9JK21vZHVsZW5hbWVHNiJJLFR5cGVzZXR0aW5nR0koX3N5c2xpYkdGJzYnLUkjbWlHRiQ2JVEiWkYnLyUnaXRhbGljR1EldHJ1ZUYnLyUsbWF0aHZhcmlhbnRHUSdpdGFsaWNGJy1JI21vR0YkNi1RIzo9RicvRjNRJ25vcm1hbEYnLyUmZmVuY2VHUSZmYWxzZUYnLyUqc2VwYXJhdG9yR0Y9LyUpc3RyZXRjaHlHRj0vJSpzeW1tZXRyaWNHRj0vJShsYXJnZW9wR0Y9LyUubW92YWJsZWxpbWl0c0dGPS8lJ2FjY2VudEdGPS8lJ2xzcGFjZUdRLDAuMjc3Nzc3OGVtRicvJSdyc3BhY2VHRkwtSShtZmVuY2VkR0YkNiYtRiM2Ly1GIzYnLUkmbWZyYWNHRiQ2KC1GIzYlLUklbXN1cEdGJDYlLUY2Ni9RKyZQYXJ0aWFsRDtGJy8lK2ZvcmVncm91bmRHUS5bMTQ0LDE0NCwxNDRdRidGOS9JK21zZW1hbnRpY3NHRiRRJmluZXJ0RidGO0Y+RkBGQkZERkZGSC9GS1EmMC4wZW1GJy9GTkZiby1JI21uR0YkNiRRIjJGJ0Y5LyUxc3VwZXJzY3JpcHRzaGlmdEdRIjBGJy9GXG9RKFswLDAsMF1GJ0Y5LUYjNiUtRiM2JkZobi1GZm42JS1GLDYlUSZ1X3h4eEYnRi9GMkZkb0Zob0ZbcEY5RltwRjkvJS5saW5ldGhpY2tuZXNzR1EiMUYnLyUrZGVub21hbGlnbkdRJ2NlbnRlckYnLyUpbnVtYWxpZ25HRltxLyUpYmV2ZWxsZWRHRj0tRjY2LVExJkludmlzaWJsZVRpbWVzO0YnRjlGO0Y+RkBGQkZERkZGSEZhb0Zjby1GLDYlUSJVRidGL0YyRltwRjktRjY2LVEiLEYnRjlGOy9GP0YxRkBGQkZERkZGSEZhby9GTlEsMC4zMzMzMzMzZW1GJy1GIzYnLUZXNihGWS1GIzYlLUYjNiZGaG4tRmZuNiUtRiw2JVEldV81eEYnRi9GMkZkb0Zob0ZbcEY5RltwRjlGZnBGaXBGXHFGXnFGYHFGY3FGW3BGOUZmcS1GIzYnLUZXNihGWS1GIzYnLUYjNiZGaG5GZnJGW3BGOUZgcS1GIzYmRmhuRmNwRltwRjlGW3BGOUZmcEZpcEZccUZecUZgcUZjcUZbcEY5RmZxLUYjNiYtRiM2Jy1GVzYoLUYjNiVGaG5GW3BGOS1GIzYlLUYjNiZGaG4tRiw2JVEldV94eEYnRi9GMkZbcEY5RltwRjlGZnBGaXBGXHFGXnFGYHFGY3FGW3BGOS1GNjYtUSgmbWludXM7RidGOUY7Rj5GQEZCRkRGRkZIL0ZLUSwwLjIyMjIyMjJlbUYnL0ZORmZ0LUYjNigtRmVvNiRRIzIwRidGOUZgcS1GUDYkLUYjNictRlc2KEZpcy1GIzYlRl9zRltwRjlGZnBGaXBGXHFGXnFGYHFGY3FGW3BGOUY5RmBxLUYsNiVRJHVfeEYnRi9GMkY5RjlGZnEtRiM2KC1GIzYnLUZXNihGaXMtRiM2JS1GIzYmRmhuLUYsNiVRInVGJ0YvRjJGW3BGOUZbcEY5RmZwRmlwRlxxRl5xRmBxRmNxRltwRjlGYnQtRiM2KC1GZW82JFEiNkYnRjlGYHEtRlA2JC1GIzYnLUZXNihGaXMtRiM2JUZhc0ZbcEY5RmZwRmlwRlxxRl5xRmBxRmNxRltwRjlGOUZgcUZldUY5RmJ0LUYjNigtRmVvNiRRIzEwRidGOUZgcUZddUZgcUZjcEY5RjlGZnEtRlc2KC1GIzYlLUYjNiotRiM2Ji1GUDYkLUYjNictRlc2KEZpcy1GIzYlLUYjNiZGaG5GZXVGW3BGOUZbcEY5RmZwRmlwRlxxRl5xRmBxRmNxRltwRjlGOUZgcUZldUY5LUY2Ni1RIitGJ0Y5RjtGPkZARkJGREZGRkhGZXRGZ3QtRiM2JkZqdkZgcUZjcEY5Rml4LUYjNiZGXXVGYHFGZnJGOUZidEZjcUY5RltwRjktRiM2JUZldUZbcEY5RmZwRmlwRlxxRl5xRltwRjlGOS8lJW9wZW5HUSJbRicvJSZjbG9zZUdRIl1GJ0ZbcEY5">NygtSSNwZEc2IjYkSSJVR0YlKiRJJnVfeHh4R0YlIiIjLUYkNiRGJyokSSV1XzV4R0YlRiotRiQ2JEYnKiZGKSIiIkYuRjIsJi1GJDYkRidJJXVfeHhHRiVGMiomLUYkNiRGJ0YuRjJJJHVfeEdGJUYyISM/LCgtRiQ2JEYnSSJ1R0YlRjIqJi1GJDYkRidGKUYyRjpGMiEiJyomRjhGMkYpRjIhIzUqJiwqKiYtRiQ2JEYnRjpGMkY6RjJGMiomRkFGMkYpRjJGMiomRjhGMkYuRjJGMkYnISIiRjJGOkZN</Equation></Text-field>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output" display="LUklbXJvd0c2Iy9JK21vZHVsZW5hbWVHNiJJLFR5cGVzZXR0aW5nR0koX3N5c2xpYkdGJzYnLUkjbWlHRiQ2JVEiWkYnLyUnaXRhbGljR1EldHJ1ZUYnLyUsbWF0aHZhcmlhbnRHUSdpdGFsaWNGJy1JI21vR0YkNi1RIzo9RicvRjNRJ25vcm1hbEYnLyUmZmVuY2VHUSZmYWxzZUYnLyUqc2VwYXJhdG9yR0Y9LyUpc3RyZXRjaHlHRj0vJSpzeW1tZXRyaWNHRj0vJShsYXJnZW9wR0Y9LyUubW92YWJsZWxpbWl0c0dGPS8lJ2FjY2VudEdGPS8lJ2xzcGFjZUdRLDAuMjc3Nzc3OGVtRicvJSdyc3BhY2VHRkwtSShtZmVuY2VkR0YkNiYtRiM2Ly1GIzYnLUkmbWZyYWNHRiQ2KC1GIzYlLUklbXN1cEdGJDYlLUY2Ni9RKyZQYXJ0aWFsRDtGJy8lK2ZvcmVncm91bmRHUS5bMTQ0LDE0NCwxNDRdRidGOS9JK21zZW1hbnRpY3NHRiRRJmluZXJ0RidGO0Y+RkBGQkZERkZGSC9GS1EmMC4wZW1GJy9GTkZiby1JI21uR0YkNiRRIjJGJ0Y5LyUxc3VwZXJzY3JpcHRzaGlmdEdRIjBGJy9GXG9RKFswLDAsMF1GJ0Y5LUYjNiUtRiM2JkZobi1GZm42JS1GLDYlUSZ1X3h4eEYnRi9GMkZkb0Zob0ZbcEY5RltwRjkvJS5saW5ldGhpY2tuZXNzR1EiMUYnLyUrZGVub21hbGlnbkdRJ2NlbnRlckYnLyUpbnVtYWxpZ25HRltxLyUpYmV2ZWxsZWRHRj0tRjY2LVExJkludmlzaWJsZVRpbWVzO0YnRjlGO0Y+RkBGQkZERkZGSEZhb0Zjby1GLDYlUSJVRidGL0YyRltwRjktRjY2LVEiLEYnRjlGOy9GP0YxRkBGQkZERkZGSEZhby9GTlEsMC4zMzMzMzMzZW1GJy1GIzYnLUZXNihGWS1GIzYlLUYjNiZGaG4tRmZuNiUtRiw2JVEldV81eEYnRi9GMkZkb0Zob0ZbcEY5RltwRjlGZnBGaXBGXHFGXnFGYHFGY3FGW3BGOUZmcS1GIzYnLUZXNihGWS1GIzYnLUYjNiZGaG5GZnJGW3BGOUZgcS1GIzYmRmhuRmNwRltwRjlGW3BGOUZmcEZpcEZccUZecUZgcUZjcUZbcEY5RmZxLUYjNiYtRiM2Jy1GVzYoLUYjNiVGaG5GW3BGOS1GIzYlLUYjNiZGaG4tRiw2JVEldV94eEYnRi9GMkZbcEY5RltwRjlGZnBGaXBGXHFGXnFGYHFGY3FGW3BGOS1GNjYtUSgmbWludXM7RidGOUY7Rj5GQEZCRkRGRkZIL0ZLUSwwLjIyMjIyMjJlbUYnL0ZORmZ0LUYjNigtRmVvNiRRIzIwRidGOUZgcS1GUDYkLUYjNictRlc2KEZpcy1GIzYlRl9zRltwRjlGZnBGaXBGXHFGXnFGYHFGY3FGW3BGOUY5RmBxLUYsNiVRJHVfeEYnRi9GMkY5RjlGZnEtRiM2KC1GIzYnLUZXNihGaXMtRiM2JS1GIzYmRmhuLUYsNiVRInVGJ0YvRjJGW3BGOUZbcEY5RmZwRmlwRlxxRl5xRmBxRmNxRltwRjlGYnQtRiM2KC1GZW82JFEiNkYnRjlGYHEtRlA2JC1GIzYnLUZXNihGaXMtRiM2JUZhc0ZbcEY5RmZwRmlwRlxxRl5xRmBxRmNxRltwRjlGOUZgcUZldUY5RmJ0LUYjNigtRmVvNiRRIzEwRidGOUZgcUZddUZgcUZjcEY5RjlGZnEtRlc2KC1GIzYlLUYjNiotRiM2JkZqdkZgcUZjcEY5LUY2Ni1RIitGJ0Y5RjtGPkZARkJGREZGRkhGZXRGZ3QtRiM2Ji1GUDYkLUYjNictRlc2KEZpcy1GIzYlLUYjNiZGaG5GZXVGW3BGOUZbcEY5RmZwRmlwRlxxRl5xRmBxRmNxRltwRjlGOUZgcUZldUY5Rl94LUYjNiZGXXVGYHFGZnJGOUZidEZjcUY5RltwRjktRiM2JUZldUZbcEY5RmZwRmlwRlxxRl5xRltwRjlGOS8lJW9wZW5HUSJbRicvJSZjbG9zZUdRIl1GJ0ZbcEY5">NygtSSNwZEc2IjYkSSJVR0YlKiRJJnVfeHh4R0YlIiIjLUYkNiRGJyokSSV1XzV4R0YlRiotRiQ2JEYnKiZGKSIiIkYuRjIsJi1GJDYkRidJJXVfeHhHRiVGMiomLUYkNiRGJ0YuRjJJJHVfeEdGJUYyISM/LCgtRiQ2JEYnSSJ1R0YlRjIqJi1GJDYkRidGKUYyRjpGMiEiJyomRjhGMkYpRjIhIzUqJiwqKiZGQUYyRilGMkYyKiYtRiQ2JEYnRjpGMkY6RjJGMiomRjhGMkYuRjJGMkYnISIiRjJGOkZN</Equation></Text-field>
</Output>
</Group>
<Group labelreference="L168" drawlabel="true">
......@@ -515,7 +515,7 @@ Jets.newresolve v 0.3 as of Oct 2018 (2018-10-26 11:43:06)</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">lprint(Z);</Text-field>
</Input>
<Output>
<Text-field style="Line Printed Output" layout="Line Printed Output">[pd(U, u_xxx^2), pd(U, u_5x^2), pd(U, u_xxx*u_5x), pd(U, u_xx)-20*pd(U, u_5x)*u_x, pd(U, u)-6*pd(U, u_xxx)*u_x-10*pd(U, u_5x)*u_xxx, (pd(U, u_x)*u_x+pd(U, u_xxx)*u_xxx+pd(U, u_5x)*u_5x-U)/u_x]</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">[pd(U, u_xxx^2), pd(U, u_5x^2), pd(U, u_xxx*u_5x), pd(U, u_xx)-20*pd(U, u_5x)*u_x, pd(U, u)-6*pd(U, u_xxx)*u_x-10*pd(U, u_5x)*u_xxx, (pd(U, u_xxx)*u_xxx+pd(U, u_x)*u_x+pd(U, u_5x)*u_5x-U)/u_x]</Text-field>
</Output>
</Group>
<Group labelreference="L171" drawlabel="true">
......
......@@ -142,7 +142,7 @@ printf("Jets.newresolve v 0.3 as of Oct 2018 (%s)\n",
Reportf(2, ["No solvable eqs found, trying to combine input eqs pairs into linear by pseudodivision"]);
AE := `resolve/nonlin/combine`(A);
Reportf(1, ["Combining %a eqs given %a results", nops(A), nops(AE)]);
Reportf(2, ["...witch properties are [price, size, LM, Vars, LC]:\n%s",
Reportf(2, ["...whitch properties are [price, size, LM, Vars, LC]:\n%s",
StringTools:-Join(map(a -> sprintf("%q\n",[a:-price,a:-size,a:-LM, a:-Vars, a:-LC]), AE))]);
ans := `resolve/lin/r`(convert(AE, set), ForceFail=ff);
......@@ -379,7 +379,11 @@ end:
`resolve/nonlin/combine/2/pseudodivision` := proc (F::record, G::record, $)
local res, resdata;
res := Algebraic:-PseudoDivision(F:-expr, G:-expr, F:-LV);
if F:-degree >= G:-degree then
res := Algebraic:-PseudoDivision(F:-expr, G:-expr, F:-LV);
else
res := Algebraic:-PseudoDivision(G:-expr, F:-expr, G:-LV);
fi;
return res;
end:
......@@ -475,7 +479,7 @@ end:
ans, v, q)
else
# try to subtract pairs of equations; not implemented yet
rs := rs union map(proc(a,v) [a:-reduced,v] end, cs, v) # move cs to rs
rs := rs union map(proc(a,v) [a:-reduced,v] end, cs, v); # move cs to rs
fi;
fi;
od;
......
......@@ -107,7 +107,7 @@
</Input>
<Output>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets 5.92 test1 as of Oct 19, 2018 (2018-10-19 09:42:25)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets.newresolve v 0.3 as of Oct 2018 (2018-10-29 14:25:50)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets.newresolve v 0.3 as of Oct 2018 (2018-10-29 15:01:07)</Text-field>
</Output>
</Group>
<Group labelreference="L222" drawlabel="true" applyint="true" applyrational="true" applyexponent="false">
......@@ -126,7 +126,7 @@
<Text-field style="Line Printed Output" layout="Line Printed Output">`Reporting to terminal`</Text-field>
</Output>
<Output>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">NyovSSRydW5HNiIiIiEvSShyZXNvbHZlR0YlIiIiL0kkcHV0R0YlRiYvSSNjY0dGJUYmL0kodW5rbm93bkdGJUYmL0kjcGRHRiVGJi9JKG5vbnplcm9HRiVGJi9JJ2Rlcml2ZUdGJUYm</Equation></Text-field>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">NyovSSRydW5HNiIiIiEvSSNwZEdGJUYmL0kobm9uemVyb0dGJUYmL0kodW5rbm93bkdGJUYmL0kkcHV0R0YlRiYvSSdkZXJpdmVHRiVGJi9JI2NjR0YlRiYvSShyZXNvbHZlR0YlIiIi</Equation></Text-field>
</Output>
</Group>
<Group labelreference="L223" drawlabel="true" applyint="true" applyrational="true" applyexponent="false">
......@@ -180,9 +180,9 @@ g2(),g1(),g0());</Text-field>
<Output>
<Text-field style="Line Printed Output" layout="Line Printed Output">RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: There are 0 linear resolvable (0 simple and 0 hard), 2 linear NONresolvable and 0 NONlinear eqs.
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 2 of 2 input eqs given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 2 of 2 input eqs given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by pseudodivision from 0 nonlinear) given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by pseudodivision from 2 eqs) given 1 results
[0] &lt;0&gt; 1. linear resolving failed in U</Text-field>
</Output>
......@@ -214,9 +214,9 @@ RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by
<Output>
<Text-field style="Line Printed Output" layout="Line Printed Output">RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: There are 0 linear resolvable (0 simple and 0 hard), 2 linear NONresolvable and 0 NONlinear eqs.
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 2 of 2 input eqs given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 2 of 2 input eqs given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by pseudodivision from 0 nonlinear) given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by pseudodivision from 2 eqs) given 1 results
[0] &lt;0&gt; 1. linear resolving failed in V</Text-field>
</Output>
......@@ -279,9 +279,9 @@ G := g2*U^2 + g1*U + g0;</Text-field>
<Output>
<Text-field style="Line Printed Output" layout="Line Printed Output">RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: There are 0 linear resolvable (0 simple and 0 hard), 0 linear NONresolvable and 2 NONlinear eqs.
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 2 of 2 input eqs given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 2 of 2 input eqs given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by pseudodivision from 2 nonlinear) given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by pseudodivision from 2 eqs) given 1 results
[0] &lt;0&gt; 1. nonlinear resolving failed in U^2</Text-field>
</Output>
......@@ -346,17 +346,11 @@ RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">resolve(F,G);</Text-field>
</Input>
<Output>
<Text-field style="Line Printed Output" layout="Line Printed Output">RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Combined 0 new linear eqs (0 resolvable) from 0 linear nonresolvable eqs
RESOLVE: &lt;0, 41344&gt; `resolve/lin/r[0]:`, resolving, 2, `out of`, 2, `eqns in `, 1, unknowns, [U]
RESOLVE: &lt;0, 41344&gt; `resolve/lin/r[0]:`, `solved 0 eqs`
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by pseudodivision from 2 nonlinear)...
<Text-field style="Line Printed Output" layout="Line Printed Output">RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: There are 0 linear resolvable (0 simple and 0 hard), 0 linear NONresolvable and 2 NONlinear eqs.
RESOLVE: &lt;0, 41344&gt; `resolve/lin/r[0]:`, resolving, 1, `out of`, 1, `eqns in `, 1, unknowns, [U]
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 2 of 2 input eqs given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/lin/r[0]:`, `solved 0 eqs`
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by pseudodivision from 2 eqs) given 1 results
[0] &lt;0&gt; 1. nonlinear resolving failed in U^2</Text-field>
</Output>
......@@ -373,7 +367,7 @@ RESOLVE: &lt;0, 41344&gt; `resolve/lin/r[0]:`, `solved 0 eqs`
<Text-field style="Line Printed Output" layout="Line Printed Output">[0] &lt;0&gt; 3. linear resolving failed in U</Text-field>
</Output>
<Output>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output" display="LUklbXJvd0c2Iy9JK21vZHVsZW5hbWVHNiJJLFR5cGVzZXR0aW5nR0koX3N5c2xpYkdGJzYoLUYjNiYtSShtZmVuY2VkR0YkNiQtRiM2Ji1GIzYmLUkjbWlHRiQ2JVEjZjJGJy8lJ2l0YWxpY0dRJXRydWVGJy8lLG1hdGh2YXJpYW50R1EnaXRhbGljRictSSNtb0dGJDYtUTEmSW52aXNpYmxlVGltZXM7RicvRjxRJ25vcm1hbEYnLyUmZmVuY2VHUSZmYWxzZUYnLyUqc2VwYXJhdG9yR0ZGLyUpc3RyZXRjaHlHRkYvJSpzeW1tZXRyaWNHRkYvJShsYXJnZW9wR0ZGLyUubW92YWJsZWxpbWl0c0dGRi8lJ2FjY2VudEdGRi8lJ2xzcGFjZUdRJjAuMGVtRicvJSdyc3BhY2VHRlUtRjU2JVEjZzFGJ0Y4RjtGQi1GPzYtUSgmbWludXM7RidGQkZERkdGSUZLRk1GT0ZRL0ZUUSwwLjIyMjIyMjJlbUYnL0ZXRmluLUY1NiVRI2YxRidGOEY7RkJGQkY+LUY1NiVRIlVGJ0Y4RjtGQi1GPzYtUSI9RidGQkZERkdGSUZLRk1GT0ZRL0ZUUSwwLjI3Nzc3NzhlbUYnL0ZXRmVvLUYjNictRj82LVEqJnVtaW51czA7RidGQkZERkdGSUZLRk1GT0ZRRmhuRmpuLUYjNiZGNEY+LUY1NiVRI2cwRidGOEY7RkItRj82LVEiK0YnRkJGREZHRklGS0ZNRk9GUUZobkZqbi1GNTYlUSNmMEYnRjhGO0ZCLyUrZm9yZWdyb3VuZEdRKFswLDAsMF1GJy8lKXJlYWRvbmx5R0ZGRkI=">LyomLCYqJkkjZjJHNiIiIiJJI2cxR0YnRihGKEkjZjFHRichIiJGKEkiVUdGJ0YoLCYqJkYmRihJI2cwR0YnRihGK0kjZjBHRidGKA==</Equation></Text-field>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output" display="LUklbXJvd0c2Iy9JK21vZHVsZW5hbWVHNiJJLFR5cGVzZXR0aW5nR0koX3N5c2xpYkdGJzYoLUYjNiYtSShtZmVuY2VkR0YkNiQtRiM2Jy1JI21vR0YkNi1RKiZ1bWludXMwO0YnLyUsbWF0aHZhcmlhbnRHUSdub3JtYWxGJy8lJmZlbmNlR1EmZmFsc2VGJy8lKnNlcGFyYXRvckdGOy8lKXN0cmV0Y2h5R0Y7LyUqc3ltbWV0cmljR0Y7LyUobGFyZ2VvcEdGOy8lLm1vdmFibGVsaW1pdHNHRjsvJSdhY2NlbnRHRjsvJSdsc3BhY2VHUSwwLjIyMjIyMjJlbUYnLyUncnNwYWNlR0ZKLUYjNiYtSSNtaUdGJDYlUSNmMkYnLyUnaXRhbGljR1EldHJ1ZUYnL0Y3USdpdGFsaWNGJy1GMzYtUTEmSW52aXNpYmxlVGltZXM7RidGNkY5RjxGPkZARkJGREZGL0ZJUSYwLjBlbUYnL0ZMRmZuLUZQNiVRI2cxRidGU0ZWRjYtRjM2LVEiK0YnRjZGOUY8Rj5GQEZCRkRGRkZIRkstRlA2JVEjZjFGJ0ZTRlZGNkY2RlgtRlA2JVEiVUYnRlNGVkY2LUYzNi1RIj1GJ0Y2RjlGPEY+RkBGQkZERkYvRklRLDAuMjc3Nzc3OGVtRicvRkxGaG8tRiM2Ji1GIzYmRk9GWC1GUDYlUSNnMEYnRlNGVkY2LUYzNi1RKCZtaW51cztGJ0Y2RjlGPEY+RkBGQkZERkZGSEZLLUZQNiVRI2YwRidGU0ZWRjYvJStmb3JlZ3JvdW5kR1EoWzAsMCwwXUYnLyUpcmVhZG9ubHlHRjtGNg==">LyomLCYqJkkjZjJHNiIiIiJJI2cxR0YnRighIiJJI2YxR0YnRihGKEkiVUdGJ0YoLCYqJkYmRihJI2cwR0YnRihGKEkjZjBHRidGKg==</Equation></Text-field>
</Output>
<Output>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">SSVGQUlMRyUqcHJvdGVjdGVkRw==</Equation></Text-field>
......@@ -421,11 +415,11 @@ RESOLVE: &lt;0, 41344&gt; `resolve/lin/r[0]:`, `solved 0 eqs`
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">resolve(F,G);</Text-field>
</Input>
<Output>
<Text-field style="Line Printed Output" layout="Line Printed Output">RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Combined 0 new linear eqs (0 resolvable) from 1 linear nonresolvable eqs
<Text-field style="Line Printed Output" layout="Line Printed Output">RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: There are 0 linear resolvable (0 simple and 0 hard), 1 linear NONresolvable and 1 NONlinear eqs.
RESOLVE: &lt;0, 41344&gt; `resolve/lin/r[0]:`, resolving, 2, `out of`, 2, `eqns in `, 1, unknowns, [U]
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 2 of 2 input eqs given 1 results
RESOLVE: &lt;0, 41344&gt; `resolve/lin/r[0]:`, `solved 0 eqs`
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Resolving 1 combined eqs (generated by pseudodivision from 2 eqs) given 1 results
[0] &lt;0&gt; 1. linear resolving failed in U</Text-field>
</Output>
......
......@@ -107,7 +107,7 @@
</Input>
<Output>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets 5.92 test1 as of Oct 19, 2018 (2018-10-19 09:42:25)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets.newresolve v 0.3 as of Oct 2018 (2018-10-29 13:51:39)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets.newresolve v 0.3 as of Oct 2018 (2018-10-29 15:01:07)</Text-field>
</Output>
</Group>
<Group labelreference="L222" drawlabel="true" applyint="true" applyrational="true" applyexponent="false">
......@@ -288,10 +288,10 @@ H := h3*U^3 + h2*U^2 + h1*U + h0; G := g2*U^2 + g1*U + g0;</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">subs(f3=0, R); normal(%);</Text-field>
</Input>
<Output>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">SSVGQUlMRyUqcHJvdGVjdGVkRw==</Equation></Text-field>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">SSJSRzYi</Equation></Text-field>
</Output>
<Output>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">SSVGQUlMRyUqcHJvdGVjdGVkRw==</Equation></Text-field>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">SSJSRzYi</Equation></Text-field>
</Output>
</Group>
<Group labelreference="L232" drawlabel="true" applyint="true" applyrational="true" applyexponent="false">
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment