diff -r 6ec461ac6c76 -r 9e2de17e4071 src/Tools/isac/Interpret/mathengine.sml --- a/src/Tools/isac/Interpret/mathengine.sml Wed May 11 07:28:13 2011 +0200 +++ b/src/Tools/isac/Interpret/mathengine.sml Wed May 11 08:25:40 2011 +0200 @@ -183,16 +183,8 @@ val PblObj {origin = (_,_,hdf), spec,...} = get_obj I pt p in (pt, (complete, Pbl, hdf, pits, pre, spec):ocalhd) end; -(*.does a step forward; returns tactic used, ctree updated. -TODO.WN0512 redesign after specify-phase became more separated from solve-phase -arg ip: - calcstate -.*) -(* val (ip as (_,p_), (ptp as (pt,p), tacis)) = (get_pos 1 1, get_calc 1); - val (ip as (_,p_), (ptp as (pt,p), tacis)) = (pos, cs); - val (ip as (_,p_), (ptp as (pt,p), tacis)) = (p, ((pt, e_pos'),[])); - val (ip as (_,p_), (ptp as (pt,p), tacis)) = (ip,cs); - *) +(* does a step forward; returns tactic used, ctree updated. +TODO.WN0512 redesign after specify-phase became more separated from solve-phase *) fun step ((ip as (_,p_)):pos') ((ptp as (pt,p), tacis):calcstate) = let val pIopt = get_pblID (pt,ip); in @@ -223,24 +215,12 @@ | cs => ("ok", cs))) end; -(* (nxt_solve_ (pt,ip)) handle e => print_exn e ; - - *) - - - - (*.does several steps within one calculation as given by "type auto"; the steps may arbitrarily go into and leave different phases, i.e. specify-phase and solve-phase.*) (*TODO.WN0512 ? redesign after the phases have been more separated at the fron-end in 05: eg. CompleteCalcHead could be done by a separate fun !!!*) -(* val (ip, cs as (ptp as (pt,p),tacis)) = (get_pos cI 1, get_calc cI); - val (ip, cs as (ptp as (pt,p),tacis)) = (pold, get_calc cI); - val (c, ip, cs as (ptp as (_,p),tacis), Step s) = - ([]:pos' list, pold, get_calc cI, auto); - *) fun autocalc c ip (cs as (ptp as (_,p),tacis)) (Step s) = if s <= 1 then let val (str, (_, c', ptp)) = step ip cs;(*1*) @@ -413,8 +393,6 @@ NEW loeschen, eigene Version von locatetac, step meNEW, CalcTreeTEST: tac'_ -replace-> tac, remove [](cid) *) -(* val ((_,tac), p, _, pt) = (nxt, p, c, pt); - *) fun me ((_,tac):tac'_) (p:pos') (_:NEW(*remove*)) (pt:ptree) = let val (pt, p) =