Commit f42d0453 authored by Hynek Baran's avatar Hynek Baran

Stable?

parent afe25fe2
......@@ -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-30 11:35:23)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets.newresolve v 0.4 as of Oct 31 2018 (2018-10-31 13:18:34)</Text-field>
</Output>
</Group>
<Group hide-output="false" labelreference="L936" drawlabel="true">
......
This diff is collapsed.
......@@ -2,14 +2,14 @@
# R e s o l v e - the new implementation (not well tested yet)
#
printf("Jets.newresolve v 0.3 as of Oct 2018 (%s)\n",
printf("Jets.newresolve v 0.4 as of Oct 31 2018 (%s)\n",
StringTools[FormatTime]("%Y-%m-%d %T", timestamp=FileTools[Status](__FILE__)[5]));
# v 0.3
# * Alhebraic:-pseudodivision used (`resolve/nonlin/reduce/2/tool` := `resolve/nonlin/reduce/2/pseudodivision`:)
# v 0.4
# * Algebraic:-PseudoDivision used (`resolve/nonlin/reduce/2/tool` := `resolve/nonlin/reduce/2/pseudodivision`:)
# * recursive remainder generation is implemented, `resolve/nonlin/reduce/LV/mindeg` is used to avoid huge results
# TODO:
# * in remainder fails, references to source nonlinear fails are missing
# * recursive remainder generation is missing (we have single-pass only)
# * `resolve/nonresrat` is not implemented
#`resolve/nonresrat` := 3;
......@@ -202,7 +202,7 @@ printf("Jets.newresolve v 0.3 as of Oct 2018 (%s)\n",
DoReports(resolve, [ans],comment=" resolve output");
if ans = FAIL then `resolve/fails/print`(); fi;
return (ans);
#####fi;
end:
......@@ -392,7 +392,7 @@ end:
end:
`resolve/nonlin/reduce/LV/2` := proc (LV, as, bs, $)
Reportf(1, ["reducing %a against %a eqs with leading Var %a", nops(as), nops(bs), LV]);
Reportf(1, ["reducing %a by %a eqs with leading Var %a", nops(as), nops(bs), LV]);
return `resolve/nonlin/reduce/LV/mindeg`(as, bs);
end:
......@@ -413,7 +413,8 @@ end;
ds := select(a->a:-degree=i, as);
if nops(ds)>0 then
rs := select(a->a:-degree<=i, bs);
ans := `resolve/nonlin/reduce/LV/all`(ds, bs);
Reportf(3, ["Reducing %a polynomials (of order %a) by %a lower-order polynomials", nops(ds), i, nops(rs)]);
ans := `resolve/nonlin/reduce/LV/all`(ds, rs);
fi;
i := i+1;
od;
......@@ -439,7 +440,7 @@ end:
# while not C[finished] do res := res, `resolve/nonlin/reduce/pair` (op(C[nextvalue]())) end do;
#end:
#
#`resolve/nonlin/reduce/LV/all` := proc(as, bs, $)
#`resolve/nonlin/reduce/LV/all/2` := proc(as, bs, $)
# op(map(proc(a)
# op(map2(`resolve/nonlin/reduce/pair`, a, bs))
# end,
......
......@@ -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-31 10:35:35)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets.newresolve v 0.4 as of Oct 31 2018 (2018-10-31 13:28:22)</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">NyovSSRydW5HNiIiIiEvSShyZXNvbHZlR0YlIiIiL0kkcHV0R0YlRiYvSSNjY0dGJUYmL0kodW5rbm93bkdGJUYmL0kobm9uemVyb0dGJUYmL0kjcGRHRiVGJi9JJ2Rlcml2ZUdGJUYm</Equation></Text-field>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">NyovSSRydW5HNiIiIiEvSSNwZEdGJUYmL0kobm9uemVyb0dGJUYmL0kodW5rbm93bkdGJUYmL0kkcHV0R0YlRiYvSSdkZXJpdmVHRiVGJi9JKHJlc29sdmVHRiUiIiIvSSNjY0dGJUYm</Equation></Text-field>
</Output>
</Group>
<Group labelreference="L223" drawlabel="true" applyint="true" applyrational="true" applyexponent="false">
......@@ -285,7 +285,7 @@ G := g2*U^2 + g1*U + g0;</Text-field>
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: No solvable eqs found, trying to reduce input 2 eqs...
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Reducing 1 (of 2) by 1 eqs (step 2) given 0 new results.
RESOLVE: &lt;0, 43396&gt; `resolve/1`[0]: Reducing 1 (of 2) by 1 eqs (step 2) given 0 new results.
[0] &lt;0&gt; 1. nonlinear resolving failed in U^2</Text-field>
</Output>
......@@ -350,11 +350,11 @@ RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Reducing 1 (of 2) by 1 eqs (step 2) gi
<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]: There are 0 linear resolvable (0 simple and 0 hard), 0 linear NONresolvable and 2 NONlinear eqs.
<Text-field style="Line Printed Output" layout="Line Printed Output">RESOLVE: &lt;0, 43396&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]: No solvable eqs found, trying to reduce input 2 eqs...
RESOLVE: &lt;0, 43396&gt; `resolve/1`[0]: No solvable eqs found, trying to reduce input 2 eqs...
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Reducing 1 (of 2) by 1 eqs (step 2) given 0 new results.
RESOLVE: &lt;0, 43396&gt; `resolve/1`[0]: Reducing 1 (of 2) by 1 eqs (step 2) given 0 new results.
[0] &lt;0&gt; 1. nonlinear resolving failed in U^2</Text-field>
</Output>
......@@ -371,7 +371,7 @@ RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Reducing 1 (of 2) by 1 eqs (step 2) gi
<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>
......@@ -419,9 +419,9 @@ RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Reducing 1 (of 2) by 1 eqs (step 2) gi
<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]: There are 0 linear resolvable (0 simple and 0 hard), 1 linear NONresolvable and 1 NONlinear eqs.
<Text-field style="Line Printed Output" layout="Line Printed Output">RESOLVE: &lt;0, 43396&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/1`[0]: No solvable eqs found, trying to combine input 2 eqs...
RESOLVE: &lt;0, 43396&gt; `resolve/1`[0]: No solvable eqs found, trying to reduce input 2 eqs...
[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-31 10:35:35)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets.newresolve v 0.4 as of Oct 31 2018 (2018-10-31 13:21:12)</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">NyovSSdkZXJpdmVHNiIiIiEvSShub256ZXJvR0YlRiYvSSNwZEdGJUYmL0kkcnVuR0YlRiYvSSRwdXRHRiVGJi9JI2NjR0YlRiYvSSh1bmtub3duR0YlRiYvSShyZXNvbHZlR0YlIiIi</Equation></Text-field>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">NyovSSRwdXRHNiIiIiEvSSRydW5HRiVGJi9JI2NjR0YlRiYvSShub256ZXJvR0YlRiYvSShyZXNvbHZlR0YlIiIiL0kjcGRHRiVGJi9JJ2Rlcml2ZUdGJUYmL0kodW5rbm93bkdGJUYm</Equation></Text-field>
</Output>
</Group>
<Group labelreference="L223" drawlabel="true" applyint="true" applyrational="true" applyexponent="false">
......@@ -262,7 +262,7 @@ RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: Reducing 1 (of 2) by 1 eqs (step 2) gi
RESOLVE: &lt;0, 41344&gt; `resolve/1`[0]: No solvable eqs found, trying to reduce input 3 eqs...
RESOLVE: &lt;0, 74112&gt; `resolve/1`[0]: Reducing 1 (of 3) by 2 eqs (step 2) given 0 new results.
RESOLVE: &lt;0, 76164&gt; `resolve/1`[0]: Reducing 1 (of 3) by 2 eqs (step 2) given 0 new results.
[0] &lt;0&gt; 1. nonlinear resolving failed in U^2</Text-field>
</Output>
......
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