diff -r 602bf61dc6df -r d6261de56fb0 test/Tools/isac/Interpret/error-pattern.sml --- a/test/Tools/isac/Interpret/error-pattern.sml Tue May 05 09:07:36 2020 +0200 +++ b/test/Tools/isac/Interpret/error-pattern.sml Tue May 05 13:33:23 2020 +0200 @@ -399,11 +399,11 @@ (*!!!!!!!!!!!!!!!!! DON'T USE me FOR FINDING nxt !!!!!!!!!!!!!!!!!!*) val (p,_,f,nxt,_,pt) = CalcTreeTEST [(elems, spec)]; (*val nxt = ("Model_Problem", ...*) - val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str_ ctxt)) pbl; + val pbl = get_obj g_pbl pt (fst p); (writeln o (I_Model.to_string ctxt)) pbl; val (p,_,f,nxt,_,pt) = me nxt p c pt; (*nxt = Add_Given "fixedValues [r = Arbfix]"*) - val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str_ ctxt)) pbl; + val pbl = get_obj g_pbl pt (fst p); (writeln o (I_Model.to_string ctxt)) pbl; (*[ (0 ,[] ,false ,#Given ,Inc fixedValues [] ,(??.empty, [])), (0 ,[] ,false ,#Find ,Inc maximum ,(??.empty, [])), @@ -412,7 +412,7 @@ (*the empty CalcHead is checked w.r.t the model and re-established as such*) val (b,pt,ocalhd) = input_icalhd pt (p,"", empty_model, Pbl, Spec.empty); - val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str_ ctxt)) pbl; + val pbl = get_obj g_pbl pt (fst p); (writeln o (I_Model.to_string ctxt)) pbl; if ocalhd2str ocalhd = "(Pbl, ??.empty, [\n(0 ,[] ,false ,#Given ,Inc fixedValues [] ,(??.empty, [])),\n(0 ,[] ,false ,#Find ,Inc maximum ,(??.empty, [])),\n(0 ,[] ,false ,#Find ,Inc valuesFor ,(??.empty, [])),\n(0 ,[] ,false ,#Relate ,Inc relations [] ,(??.empty, []))], [], \n(\"ThyC.id_empty\", [\"e_pblID\"], [\"e_metID\"]) )" then () else error "informtest.sml: diff.behav. max 1"; (*there is one input to the model (could be more)*) @@ -420,7 +420,7 @@ input_icalhd pt (p,"", [Given ["fixedValues [r=Arbfix]"], Find ["maximum", "valuesFor"], Relate ["relations"]], Pbl, Spec.empty); - val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str_ ctxt)) pbl; + val pbl = get_obj g_pbl pt (fst p); (writeln o (I_Model.to_string ctxt)) pbl; if ocalhd2str ocalhd = "(Pbl, ??.empty, [\n(1 ,[1,2,3] ,true ,#Given ,Cor fixedValues [r = Arbfix] ,(fix_, [[r = Arbfix]])),\n(0 ,[] ,false ,#Find ,Inc maximum ,(??.empty, [])),\n(0 ,[] ,false ,#Find ,Inc valuesFor ,(??.empty, [])),\n(0 ,[] ,false ,#Relate ,Inc relations [] ,(??.empty, []))], [], \n(\"ThyC.id_empty\", [\"e_pblID\"], [\"e_metID\"]) )" then () else error "informtest.sml: diff.behav. max 2"; @@ -430,7 +430,7 @@ Find ["maximum A", "valuesFor [a,b]"], Relate ["relations [A=a*b, a/2=r*sin alpha, \ \b/2=r*cos alpha]"]], Pbl, Spec.empty); - val pbl = get_obj g_pbl pt''''' (fst p); (writeln o (itms2str_ ctxt)) pbl; + val pbl = get_obj g_pbl pt''''' (fst p); (writeln o (I_Model.to_string ctxt)) pbl; if ocalhd2str ocalhd = ------------^^^^^^^^^^ missing !!!*) (*this input is complete in variant 1 (variant 3 does not work yet)*) @@ -440,7 +440,7 @@ Relate ["relations [A=a*b, \ \(a/2)^^^2 + (b/2)^^^2 = r^^^2]"]], Pbl, Spec.empty); - val pbl = get_obj g_pbl pt''''' (fst p); (writeln o (itms2str_ ctxt)) pbl; + val pbl = get_obj g_pbl pt''''' (fst p); (writeln o (I_Model.to_string ctxt)) pbl; modifycalcheadOK2xml 111 (bool2str b) ocalhd; *) @@ -655,8 +655,8 @@ (*default_print_depth 5;*) writeln"-----------------------------------------------------------"; spec; -writeln (itms2str_ ctxt probl); -writeln (itms2str_ ctxt meth); +writeln (I_Model.to_string ctxt probl); +writeln (I_Model.to_string ctxt meth); writeln (Istate.string_of (fst istate)); refFormula 1 ([],Pbl) (*--> correct CalcHead*); @@ -677,12 +677,12 @@ (*("Isac_Knowledge", ["derivative_of", "function"], ["diff", "differentiate_on_R"]) : spec*) -writeln (itms2str_ ctxt probl); +writeln (I_Model.to_string ctxt probl); (*[ (1 ,[1] ,true ,#Given ,Cor functionTerm (x ^^^ 2 + x + 1) ,(f_, [x ^^^ 2 + x + 1])), (2 ,[1] ,true ,#Given ,Cor differentiateFor x ,(v_, [x])), (3 ,[1] ,true ,#Find ,Cor derivative f_'_f ,(f_'_f, [f_'_f]))]*) -writeln (itms2str_ ctxt meth); +writeln (I_Model.to_string ctxt meth); (*[ (1 ,[1] ,true ,#Given ,Cor functionTerm (x ^^^ 2 + x + 1) ,(f_, [x ^^^ 2 + x + 1])), (2 ,[1] ,true ,#Given ,Cor differentiateFor x ,(v_, [x])), @@ -720,12 +720,12 @@ (*("Isac_Knowledge", ["derivative_of", "function"], ["diff", "differentiate_on_R"]) : spec*) -writeln (itms2str_ ctxt probl); +writeln (I_Model.to_string ctxt probl); (*[ (1 ,[1] ,true ,#Given ,Cor functionTerm (x ^^^ 2 + x + 1) ,(f_, [x ^^^ 2 + x + 1])), (2 ,[1] ,true ,#Given ,Cor differentiateFor x ,(v_, [x])), (3 ,[1] ,true ,#Find ,Cor derivative f_'_f ,(f_'_f, [f_'_f]))]*) -writeln (itms2str_ ctxt meth); +writeln (I_Model.to_string ctxt meth); (*[ (1 ,[1] ,true ,#Given ,Cor functionTerm (x ^^^ 2 + x + 1) ,(f_, [x ^^^ 2 + x + 1])), (2 ,[1] ,true ,#Given ,Cor differentiateFor x ,(v_, [x])), @@ -1253,7 +1253,7 @@ (#1 (some_spec ospec spec), oris, []:itm list, ((#ppc o get_pbt) (#2 (some_spec ospec spec))),(imodel2fstr imodel)); val iii = appl_adds dI oris ppc pbt (selct::ss); - tracing(itms2str_ thy iii); + tracing(I_Model.to_string thy iii); val itm = appl_add' dI oris ppc pbt selct; val ppc = insert_ppc' itm ppc; @@ -1265,7 +1265,7 @@ val _::selct::ss = (selct::ss); val itm = appl_add' dI oris ppc pbt selct; val ppc = insert_ppc' itm ppc; - tracing(itms2str_ thy ppc); + tracing(I_Model.to_string thy ppc); val _::selct::ss = (selct::ss); val itm = appl_add' dI oris ppc pbt selct;