Commit c9da6e95 authored by Hynek Baran's avatar Hynek Baran

Little Reporting fixes

parent 226ebceb
......@@ -43,10 +43,10 @@ printf("Jets.newresolve v 0.3 as of Oct 2018 (%s)\n",
A1S, A1H :=`resolve/simplehard`(A1);
Reportf(1, ["There are %a linear resolvable (%a simple and %a hard),"
" %a linear NONresolvable and %a NONlinear eqs. Prices, sizes, and leading monomials are:\n"
"LIN. RESolv.: %a,\nLIN. NONresolv: %a;\nNONLIN: %a.\n",
nops(A1), nops(A1S), nops(A1H), nops(A0), nops(AN),
Reportf(0, ["There are %a linear resolvable (%a simple and %a hard), %a linear NONresolvable and %a NONlinear eqs.",
nops(A1), nops(A1S), nops(A1H), nops(A0), nops(AN)]);
Reportf(1, ["Prices, sizes, and leading monomials are:\n"
"LIN. RESolv.: %a,\nLIN. NONresolv: %a;\nNONLIN: %a.\n",
map(a->[a:-price,a:-size, a:-LM], A1),
map(a->[a:-price,a:-size, a:-LM], A0),
map(a->[a:-price,a:-size, a:-LM], AN)]);
......@@ -135,17 +135,20 @@ printf("Jets.newresolve v 0.3 as of Oct 2018 (%s)\n",
# sprintf("# LVars=%q\n", map(a->a:-Vars[1], B))));
ans := `resolve/lin/r`(convert(B, set), vl, ForceFail=ff);
Reportf(0, ["Resolving %a of %a input eqs given %a results", nops(B), nops(A), nops(ans)]);
# if no usable results, lets try to generate pseudoremainders of polynomial pairs
if has(`resolve/opts/postproc`, 'nonlinear') and ans = FAIL then
Reportf(2, ["No solvable eqs found, trying to combine all eqs pairs into linear"]);
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 nonlinear eqs given %a results", nops(AN), nops(AE)]);
Reportf(1, ["Combining %a eqs given %a results", nops(A), nops(AE)]);
Reportf(2, ["...witch 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))]);
Reportf(0, ["Resolving %a combined eqs (generated by pseudodivision from %a nonlinear)...", nops(AE), nops(AN)]);
ans := `resolve/lin/r`(convert(AE, set), ForceFail=ff);
Reportf(0, ["Resolving %a combined eqs (generated by pseudodivision from %a eqs) given %a results", nops(AE), nops(A), nops(ans)]);
fi;
#### if still no usable results, lets try to linearize nonlinear eqs by pd (linderive)
......@@ -185,7 +188,7 @@ end:
if a=0 then return NULL fi;
Vs := VarL(b);
if nops(Vs)=0 then # no unknowns
Reportf(0, ["No unknowns in %a", a]);
Reportf(3, ["No unknowns in %a", a]);
return compat[Record[packed]](
"expr"=a,
"reduced"=NULL,
......@@ -437,7 +440,7 @@ end:
bs := remove(proc(d) evalb(d:-reduced = 0) end, bs); # remove zero eqs.
Report(0, [`resolving`, nops(ds), `out of`, nops(ds), `eqns in `, nops(vl), `unknowns`, vl]) ;
Report(1, [`resolving`, nops(ds), `out of`, nops(ds), `eqns in `, nops(vl), `unknowns`, vl]) ;
for v in vl do # for v running through all Vars in reverse Varordering
#`resolve/lin/reduce`(bs, vl); ### called above
......@@ -477,7 +480,7 @@ end:
fi;
od;
Report(0, cat(`solved `, nops(ans), ` eqs`));
Report(1, cat(`solved `, nops(ans), ` eqs`));
Report(2, cat(`rejected `, nops(rs), ` eqs`));
Report(2, [`sizes: solved:`, op(sort(map(size,[op(ans)]))), `rejected:`, op(sort(map(size,[op(rs)]))), `left `, nops(bs), ` eq.`]);
......
This diff is collapsed.
......@@ -275,6 +275,14 @@ G := g3*U^3 + g2*U^2 + g1*U + g0;</Text-field>
</Group>
<Group labelreference="L234" drawlabel="true" applyint="true" applyrational="true" applyexponent="false">
<Input>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">Algebraic:-PseudoDivision(G,rrr,U);</Text-field>
</Input>
<Output>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output" display="LUklbXJvd0c2Iy9JK21vZHVsZW5hbWVHNiJJLFR5cGVzZXR0aW5nR0koX3N5c2xpYkdGJzZhcy1JI21vR0YkNi1RKiZ1bWludXMwO0YnLyUsbWF0aHZhcmlhbnRHUSdub3JtYWxGJy8lJmZlbmNlR1EmZmFsc2VGJy8lKnNlcGFyYXRvckdGNC8lKXN0cmV0Y2h5R0Y0LyUqc3ltbWV0cmljR0Y0LyUobGFyZ2VvcEdGNC8lLm1vdmFibGVsaW1pdHNHRjQvJSdhY2NlbnRHRjQvJSdsc3BhY2VHUSwwLjIyMjIyMjJlbUYnLyUncnNwYWNlR0ZDLUYjNiotSSNtaUdGJDYlUSJVRicvJSdpdGFsaWNHUSV0cnVlRicvRjBRJ2l0YWxpY0YnLUYsNi1RMSZJbnZpc2libGVUaW1lcztGJ0YvRjJGNUY3RjlGO0Y9Rj8vRkJRJjAuMGVtRicvRkVGVS1GSTYlUSNmMEYnRkxGT0ZRLUZJNiVRI2YyRidGTEZPRlEtSSVtc3VwR0YkNiUtRkk2JVEjZzNGJ0ZMRk8tSSNtbkdGJDYkUSI3RidGLy8lMXN1cGVyc2NyaXB0c2hpZnRHUSIwRidGLy1GLDYtUSIrRidGL0YyRjVGN0Y5RjtGPUY/RkFGRC1GIzYsRkhGUUZXRlEtRkk2JVEjZjNGJ0ZMRk9GUS1GSTYlUSNnMkYnRkxGT0ZRLUZobjYlRmpuLUZebzYkUSI2RidGL0Zhb0YvRmRvLUYjNixGSEZRRldGUS1GSTYlUSNmNEYnRkxGT0ZRLUZJNiVRI2cxRidGTEZPRlFGX3BGLy1GLDYtUSgmbWludXM7RidGL0YyRjVGN0Y5RjtGPUY/RkFGRC1GIzYsRkhGUUZXRlFGZnBGUS1GaG42JUZccC1GXm82JFEiMkYnRi9GYW9GUS1GaG42JUZqbi1GXm82JFEiNUYnRi9GYW9GL0Zkby1GIzYsRkhGUUZXRlEtRkk2JVEjZjVGJ0ZMRk9GUS1GSTYlUSNnMEYnRkxGT0ZRRl9wRi9GXHEtRiM2MEZjcUZRRkhGUUZXRlFGXXJGUUZpcEZRRlxwRlFGZnFGL0Zkby1GIzYsRkhGUUZXRlFGXXJGUS1GaG42JUZccC1GXm82JFEiM0YnRi9GYW9GUS1GaG42JUZqbi1GXm82JFEiNEYnRi9GYW9GL0Zkby1GIzYqRkhGUS1GaG42JUZaRmNxRmFvRlFGaXBGUUZfcEYvRmRvLUYjNixGSEZRRlpGUUZpb0ZRRmByRlFGX3BGL0ZccS1GIzYuRkhGUUZaRlFGaW9GUUZpcEZRRlxwRlFGZnFGL0ZccS1GIzYuRmNxRlFGSEZRRlpGUUZmcEZRLUZobjYlRmlwRmNxRmFvRlFGZnFGL0Zkby1GIzYuRkhGUUZaRlFGZnBGUUZpcEZRRmFxRlFGXHNGL0ZccS1GIzYwRmlyRlFGSEZRRlpGUUZdckZRRmByRlFGaXBGUUZmcUYvRmRvLUYjNjBGaXJGUUZIRlFGWkZRRl1yRlFGW3RGUUZccEZRRlxzRi9GXHEtRiM2LkZIRlFGWkZRRl1yRlFGaXBGUUZnckZRLUZobjYlRmpuRmlyRmFvRi9GXHEtRiM2LEZIRlEtRmhuNiVGaW9GY3FGYW9GUUZgckZRRlxwRlFGZnFGL0Zkby1GIzYqRkhGUUZpdEZRRlt0RlFGZnFGL0Zkby1GIzYuRkhGUUZpb0ZRRmZwRlFGYHJGUUZpcEZRRmZxRi9GZG8tRiM2LkZIRlFGaW9GUUZmcEZRRmByRlFGYXFGUUZcc0YvRlxxLUYjNi5GSEZRRmlvRlFGZnBGUUZbdEZRRlxwRlFGXHNGL0ZccS1GIzYsRkhGUUZpb0ZRRl1yRlEtRmhuNiVGYHJGY3FGYW9GUUZmcUYvRmRvLUYjNjJGY3FGUUZIRlFGaW9GUUZdckZRRmByRlFGaXBGUUZccEZRRlxzRi9GXHEtRiM2LkZIRlFGaW9GUUZdckZRRmByRlFGZ3JGUUZldEYvRlxxLUYjNi5GY3FGUUZIRlFGaW9GUUZdckZRLUZobjYlRmlwRmlyRmFvRlFGXHNGL0Zkby1GIzYuRkhGUUZpb0ZRRl1yRlFGW3RGUUZhcUZRRmV0Ri9GZG8tRiM2KkZIRlEtRmhuNiVGZnBGY3FGYW9GUUZldUZRRmZxRi9GXHEtRiM2MEZjcUZRRkhGUUZjdkZRRmByRlFGaXBGUUZccEZRRlxzRi9GZG8tRiM2KkZIRlFGY3ZGUUZddkZRRlxzRi9GXHEtRiM2MEZjcUZRRkhGUUZmcEZRRl1yRlFGZXVGUUZccEZRRlxzRi9GZG8tRiM2LkZIRlFGZnBGUUZdckZRRmByRlFGW3RGUUZcc0YvRmRvLUYjNjJGY3FGUUZIRlFGZnBGUUZdckZRRmByRlFGaXBGUUZhcUZRRmV0Ri9GXHEtRiM2LkZIRlFGZnBGUUZdckZRRl12RlFGXHBGUUZldEYvRmRvLUYjNi5GY3FGUUZIRlEtRmhuNiVGXXJGY3FGYW9GUUZldUZRRmlwRlFGXHNGL0Zkby1GIzYsRkhGUUZjd0ZRRmV1RlFGYXFGUUZldEYvRlxxLUYjNjBGaXJGUUZIRlFGY3dGUUZgckZRRlt0RlFGXHBGUUZldEYvRmRvLUYjNipGSEZRRmN3RlEtRmhuNiVGaXBGXnNGYW9GUUZldEYvRlxxLUYjNipGV0ZRRlpGUUZccEZRRl9wRi9GXHEtRiM2KkZXRlFGaW9GUUZpcEZRRl9wRi9GZG8tRiM2KkZXRlFGaW9GUUZhcUZRRmZxRi9GXHEtRiM2KkZXRlFGZnBGUUZgckZRRl9wRi9GZG8tRiM2LkZjcUZRRldGUUZmcEZRRmlwRlFGXHBGUUZmcUYvRlxxLUYjNipGV0ZRRmZwRlFGZ3JGUUZcc0YvRmRvLUYjNi5GY3FGUUZXRlFGXXJGUUZgckZRRlxwRlFGZnFGL0Zkby1GIzYqRldGUUZdckZRRlt0RlFGZnFGL0ZccS1GIzYuRmlyRlFGV0ZRRl1yRlFGaXBGUUZhcUZRRlxzRi9GZG8tRiM2KkZXRlFGXXJGUS1GaG42JUZccEZec0Zhb0ZRRmV0Ri9GZG8tRiM2KEZjc0ZRRmByRlFGX3BGL0ZccS1GIzYsRlpGUUZpb0ZRRmByRlFGXHBGUUZmcUYvRlxxLUYjNi5GY3FGUUZaRlFGZnBGUUZgckZRRmlwRlFGZnFGL0Zkby1GIzYsRlpGUUZmcEZRRmByRlFGYXFGUUZcc0YvRlxxLUYjNixGY3FGUUZaRlFGXXJGUUZldUZRRmZxRi9GZG8tRiM2MEZpckZRRlpGUUZdckZRRmByRlFGaXBGUUZccEZRRlxzRi9GXHEtRiM2LEZaRlFGXXJGUUZgckZRRmdyRlFGZXRGL0Zkby1GIzYqRml0RlFGYHJGUUZpcEZRRmZxRi9GZG8tRiM2KkZpb0ZRRmZwRlFGZXVGUUZmcUYvRlxxLUYjNi5GaW9GUUZmcEZRRmByRlFGaXBGUUZccEZRRlxzRi9GXHEtRiM2LkZjcUZRRmlvRlFGXXJGUUZgckZRRlt0RlFGXHNGL0Zkby1GIzYuRmlvRlFGXXJGUUZgckZRRmlwRlFGYXFGUUZldEYvRlxxLUYjNipGY3ZGUUZldUZRRlxwRlFGXHNGL0Zkby1GIzYqRmN2RlFGYHJGUUZbdEZRRlxzRi9GZG8tRiM2LEZmcEZRRl1yRlFGZXVGUUZpcEZRRlxzRi9GZG8tRiM2LEZmcEZRRl1yRlFGZXVGUUZhcUZRRmV0Ri9GXHEtRiM2LkZmcEZRRl1yRlFGYHJGUUZbdEZRRlxwRlFGZXRGL0Zkby1GIzYoRmN3RlEtRmhuNiVGYHJGaXJGYW9GUUZcc0YvRlxxLUYjNi5GY3FGUUZjd0ZRRmV1RlFGaXBGUUZccEZRRmV0Ri9GZG8tRiM2KkZjd0ZRRmByRlFGXXZGUUZldEYvRi8=">LGBzKipJIlVHNiIiIiJJI2YwR0YlRiZJI2YyR0YlRiZJI2czR0YlIiIoISIiKixGJEYmRidGJkkjZjNHRiVGJkkjZzJHRiVGJkYpIiInRiYqLEYkRiZGJ0YmSSNmNEdGJUYmSSNnMUdGJUYmRilGL0YmKixGJEYmRidGJkYxRiZGLiIiI0YpIiImRisqLEYkRiZGJ0YmSSNmNUdGJUYmSSNnMEdGJUYmRilGL0YmKi5GJEYmRidGJkY3RiZGMkYmRi5GJkYpRjUhIiMqLEYkRiZGJ0YmRjdGJkYuIiIkRikiIiVGJioqRiRGJkYoRjRGMkYmRilGL0YmKixGJEYmRihGJkYtRiZGOEYmRilGL0YmKi5GJEYmRihGJkYtRiZGMkYmRi5GJkYpRjVGKyosRiRGJkYoRiZGMUYmRjJGNEYpRjVGOiouRiRGJkYoRiZGMUYmRjJGJkYuRjRGKUY9RiYqLkYkRiZGKEYmRjdGJkY4RiZGMkYmRilGNSEiJCouRiRGJkYoRiZGN0YmRjJGNEYuRiZGKUY9RjwqLkYkRiZGKEYmRjdGJkYyRiZGLkY8RilGPEYrKixGJEYmRi1GNEY4RiZGLkYmRilGNUYrKipGJEYmRi1GNEYyRjRGKUY1RiYqLkYkRiZGLUYmRjFGJkY4RiZGMkYmRilGNUYmKi5GJEYmRi1GJkYxRiZGOEYmRi5GNEYpRj1GJiouRiRGJkYtRiZGMUYmRjJGNEYuRiZGKUY9RisqLEYkRiZGLUYmRjdGJkY4RjRGKUY1RisqMEYkRiZGLUYmRjdGJkY4RiZGMkYmRi5GJkYpRj1GNCouRiRGJkYtRiZGN0YmRjhGJkYuRjxGKUY8RisqLEYkRiZGLUYmRjdGJkYyRjxGKUY9RjoqLkYkRiZGLUYmRjdGJkYyRjRGLkY0RilGPEYmKipGJEYmRjFGNEY4RjRGKUY1RiYqLkYkRiZGMUY0RjhGJkYyRiZGLkYmRilGPUY6KipGJEYmRjFGNEYyRjxGKUY9RiYqLkYkRiZGMUYmRjdGJkY4RjRGLkYmRilGPUY6Ki5GJEYmRjFGJkY3RiZGOEYmRjJGNEYpRj1GJiowRiRGJkYxRiZGN0YmRjhGJkYyRiZGLkY0RilGPEY0Ki5GJEYmRjFGJkY3RiZGMkY8Ri5GJkYpRjxGKyosRiRGJkY3RjRGOEY0RjJGJkYpRj1GNCosRiRGJkY3RjRGOEY0Ri5GNEYpRjxGJiouRiRGJkY3RjRGOEYmRjJGNEYuRiZGKUY8RkQqKkYkRiZGN0Y0RjJGPUYpRjxGJioqRidGJkYoRiZGLkYmRilGL0YrKipGJ0YmRi1GJkYyRiZGKUYvRisqKkYnRiZGLUYmRi5GNEYpRjVGJioqRidGJkYxRiZGOEYmRilGL0YrKixGJ0YmRjFGJkYyRiZGLkYmRilGNUY0KipGJ0YmRjFGJkYuRjxGKUY9RisqLEYnRiZGN0YmRjhGJkYuRiZGKUY1RjQqKkYnRiZGN0YmRjJGNEYpRjVGJiosRidGJkY3RiZGMkYmRi5GNEYpRj1GRCoqRidGJkY3RiZGLkY9RilGPEYmKihGKEY0RjhGJkYpRi9GJiosRihGJkYtRiZGOEYmRi5GJkYpRjVGKyosRihGJkYxRiZGOEYmRjJGJkYpRjVGOiosRihGJkYxRiZGOEYmRi5GNEYpRj1GJioqRihGJkY3RiZGOEY0RilGNUY6Ki5GKEYmRjdGJkY4RiZGMkYmRi5GJkYpRj1GPCosRihGJkY3RiZGOEYmRi5GPEYpRjxGKyoqRi1GNEY4RiZGMkYmRilGNUYmKipGLUYmRjFGJkY4RjRGKUY1RiYqLkYtRiZGMUYmRjhGJkYyRiZGLkYmRilGPUYrKixGLUYmRjdGJkY4RiZGMkY0RilGPUY6Ki5GLUYmRjdGJkY4RiZGMkYmRi5GNEYpRjxGJioqRjFGNEY4RjRGLkYmRilGPUYrKipGMUY0RjhGJkYyRjRGKUY9RiYqLEYxRiZGN0YmRjhGNEYyRiZGKUY9RiYqLEYxRiZGN0YmRjhGNEYuRjRGKUY8RiYqLkYxRiZGN0YmRjhGJkYyRjRGLkYmRilGPEYrKihGN0Y0RjhGPEYpRj1GJiosRjdGNEY4RjRGMkYmRi5GJkYpRjxGOioqRjdGNEY4RiZGMkY8RilGPEYm</Equation></Text-field>
</Output>
</Group>
<Group labelreference="L238" drawlabel="true" applyint="true" applyrational="true" applyexponent="false">
<Input>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal"></Text-field>
</Input>
</Group>
......
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