Commit 04532e3f authored by Hynek Baran's avatar Hynek Baran

numerous bug fixes in the computation of coverings (MM 23.4.2019)

parent fa6da3f0
......@@ -116,8 +116,8 @@
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">read(&quot;../mc/Jets.s&quot;);</Text-field>
</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.4 as of Nov 06 2018 (2018-11-06 09:52:35)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets 5.92 test3 as of May 2, 2019 (2019-05-02 10:53:51)</Text-field>
<Text-field style="Line Printed Output" layout="Line Printed Output">Jets.newresolve v 0.4 as of Nov 16 2018 (2019-05-02 10:50:15)</Text-field>
</Output>
</Group>
<Group hide-output="false" labelreference="L936" drawlabel="true">
......@@ -992,7 +992,7 @@ unknowns(c,b,a):</Text-field>
</Group>
<Group hide-output="false" labelreference="L44" drawlabel="true">
<Input>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">parameter(w): nonlocal(w):</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">parameter(w): nonlocal(w): dependence(f(x,u));</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">T (vfapply(0,f), 0, `vfapply 1`); </Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">T (vfapply(A + B, f), 'vfapply(A,f)' + 'vfapply(B,f)', `vfapply 2`); </Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">T (vfapply(2*A, f), 2*'vfapply(A, f)', `vfapply 3a`);</Text-field>
......@@ -1010,6 +1010,9 @@ unknowns(c,b,a):</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal"></Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal"></Text-field>
</Input>
<Output>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">L0kiZkc2IjwkSSJ1R0YkSSJ4R0Yk</Equation></Text-field>
</Output>
</Group>
<Group hide-output="false" labelreference="L42" drawlabel="true">
<Input>
......@@ -1039,10 +1042,13 @@ unknowns(c,b,a):</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal"> 0, `comm 9c`);</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">T (comm(comm(A,B), C) + comm(comm(B,C), A) + comm(comm(C,A), B),</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal"> 0, `comm 9d`);</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal"></Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal">clear(dependence):</Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal"></Text-field>
<Text-field prompt="&gt; " style="Maple Input" layout="Normal"></Text-field>
</Input>
<Output>
<Text-field style="2D Output" layout="Maple Output"><Equation executable="false" style="2D Output">STdDbGVhcmluZ35kZXBlbmRlbmNlJ3MuRzYi</Equation></Text-field>
</Output>
</Group>
<Group labelreference="L975" drawlabel="true" applyint="true" applyrational="true" applyexponent="false">
<Input>
......
......@@ -192,6 +192,7 @@
# v 5.92
# * testing new nonlinear resolve implementation in file (cat(jets_new_resolve_enable, "/Jets.newresolve.s"))
# * LVar returns NULL on expressions without Vars
# * numerous bug fixes in the computation of coverings (MM 23.4.2019)
###########################################################################################
###########################################################################################
......@@ -200,7 +201,7 @@
###########################################################################################
interface(screenwidth=120):
printf("Jets 5.92 test2 as of Mar 25, 2019 (%s)\n",
printf("Jets 5.92 test3 as of May 2, 2019 (%s)\n",
StringTools[FormatTime]("%Y-%m-%d %T", timestamp=FileTools[Status](__FILE__)[5]));
#
......@@ -3855,14 +3856,10 @@ end:
`type/nonlocal` := proc(x)
global `nonlocal/s`;
global `name/tab`;
evalb(type (x,'name') and type (`name/tab`[x],'set')
and member ('nonlocal',`name/tab`[x])) end:
vectorfield := proc()
global `name/tab`;
local a,aux;
......@@ -4015,11 +4012,8 @@ vfapply := proc(x,f)
elif type (x,`vectorfield/TD`) then TD(f,op(x))
elif type (x,`vectorfield/c`) then
vfapply(op(1,x), vfapply(op(2,x),f))
- vfapply(op(2,x), vfapply(op(1,x),f))
elif type (x,'name') then
if type (x,`vectorfield`) then `vfapply/~`(f,x)
else ERROR (`not a vectorfield`, x)
fi
- vfapply(op(2,x), vfapply(op(1,x),f))
elif type (x,`vectorfield`) then `vfapply/~`(f,x) # MM 23.4.2019
else 'vfapply'(x,f) ## M.M. Sept. 19, 2O12
fi
end:
......@@ -4040,8 +4034,8 @@ end:
end:
`vfapply/~` := proc(f,x)
if type (x,'tail') and type (f,'dep') then
if ars(f) intersect `nonlocal/s` = {} then
if type (x,'tail') and type (ars(f),'set') then # MM 23.4.2019
if select(type, ars(f), nonlocal) = {} then # MM 23.4.2019
RETURN (0)
fi
fi;
......@@ -4051,9 +4045,9 @@ end:
if type (x,'tail') then 0
else 'vfapply'(x,f)
fi
elif type (f,'dep') then
elif type (ars(f),'set') then # MM 23.4.2019
if `dep/tab`[f] = {} then 0
elif type (x,'tail') and ars(f) intersect `nonlocal/s` = {} then 0
elif type (x,'tail') and select(type, ars(f), nonlocal) = {} then 0 # MM 23.4.2019
else 'vfapply'(x,f)
fi
elif type (f,{`vectorfield/TD`,`vectorfield/pd`}) then
......
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