1.1 --- a/test/Tools/isac/ME/inform.sml	Tue Aug 17 09:05:51 2010 +0200
     1.2 +++ b/test/Tools/isac/ME/inform.sml	Wed Aug 18 13:40:09 2010 +0200
     1.3 @@ -371,11 +371,11 @@
     1.4   (*!!!!!!!!!!!!!!!!! DON'T USE me FOR FINDING nxt !!!!!!!!!!!!!!!!!!*)
     1.5   val (p,_,f,nxt,_,pt) = CalcTreeTEST [(elems, spec)];
     1.6   (*val nxt = ("Model_Problem", ...*)
     1.7 - val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str thy)) pbl; 
     1.8 + val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str_ ctxt)) pbl; 
     1.9  
    1.10   val (p,_,f,nxt,_,pt) = me nxt p c pt;
    1.11   (*nxt = Add_Given "fixedValues [r = Arbfix]"*)
    1.12 - val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str thy)) pbl; 
    1.13 + val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str_ ctxt)) pbl; 
    1.14  (*[
    1.15  (0 ,[] ,false ,#Given ,Inc fixedValues [] ,(??.empty, [])),
    1.16  (0 ,[] ,false ,#Find ,Inc maximum ,(??.empty, [])),
    1.17 @@ -384,7 +384,7 @@
    1.18  
    1.19   (*the empty CalcHead is checked w.r.t the model and re-established as such*)
    1.20   val (b,pt,ocalhd) = input_icalhd pt (p,"", empty_model, Pbl, e_spec);
    1.21 - val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str thy)) pbl; 
    1.22 + val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str_ ctxt)) pbl; 
    1.23   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(\"e_domID\", [\"e_pblID\"], [\"e_metID\"]) )" then () else raise error "informtest.sml: diff.behav. max 1";
    1.24  
    1.25   (*there is one input to the model (could be more)*)
    1.26 @@ -392,7 +392,7 @@
    1.27       input_icalhd pt (p,"", [Given ["fixedValues [r=Arbfix]"],
    1.28  			     Find ["maximum", "valuesFor"],
    1.29  			     Relate ["relations"]], Pbl, e_spec);
    1.30 - val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str thy)) pbl; 
    1.31 + val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str_ ctxt)) pbl; 
    1.32   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(\"e_domID\", [\"e_pblID\"], [\"e_metID\"]) )" then () 
    1.33   else raise error "informtest.sml: diff.behav. max 2";
    1.34  
    1.35 @@ -402,7 +402,7 @@
    1.36  			     Find ["maximum A", "valuesFor [a,b]"],
    1.37  			     Relate ["relations [A=a*b, a/2=r*sin alpha, \
    1.38  				     \b/2=r*cos alpha]"]], Pbl, e_spec);
    1.39 - val pbl = get_obj g_pbl pt''''' (fst p); (writeln o (itms2str thy)) pbl; 
    1.40 + val pbl = get_obj g_pbl pt''''' (fst p); (writeln o (itms2str_ ctxt)) pbl; 
    1.41   if ocalhd2str ocalhd = ------------^^^^^^^^^^ missing !!!*)
    1.42  
    1.43   (*this input is complete in variant 1 (variant 3 does not work yet)*)
    1.44 @@ -412,7 +412,7 @@
    1.45  			     Relate ["relations [A=a*b, \
    1.46  				     \(a/2)^^^2 + (b/2)^^^2 = r^^^2]"]], 
    1.47  		      Pbl, e_spec);
    1.48 - val pbl = get_obj g_pbl pt''''' (fst p); (writeln o (itms2str thy)) pbl; 
    1.49 + val pbl = get_obj g_pbl pt''''' (fst p); (writeln o (itms2str_ ctxt)) pbl; 
    1.50  
    1.51   modifycalcheadOK2xml 111 (bool2str b) ocalhd;
    1.52  *)
    1.53 @@ -522,8 +522,8 @@
    1.54  print_depth 5;
    1.55  writeln"-----------------------------------------------------------";
    1.56  spec;
    1.57 -writeln (itms2str thy probl);
    1.58 -writeln (itms2str thy meth);
    1.59 +writeln (itms2str_ ctxt probl);
    1.60 +writeln (itms2str_ ctxt meth);
    1.61  writeln (istate2str istate);
    1.62  
    1.63  print_depth 3;
    1.64 @@ -547,12 +547,12 @@
    1.65  (*("Isac.thy",
    1.66        ["derivative_of", "function"],
    1.67        ["diff", "differentiate_on_R"]) : spec*)
    1.68 -writeln (itms2str thy probl);
    1.69 +writeln (itms2str_ ctxt probl);
    1.70  (*[
    1.71  (1 ,[1] ,true ,#Given ,Cor functionTerm (x ^^^ 2 + x + 1) ,(f_, [x ^^^ 2 + x + 1])),
    1.72  (2 ,[1] ,true ,#Given ,Cor differentiateFor x ,(v_, [x])),
    1.73  (3 ,[1] ,true ,#Find ,Cor derivative f_'_ ,(f_'_, [f_'_]))]*)
    1.74 -writeln (itms2str thy meth);
    1.75 +writeln (itms2str_ ctxt meth);
    1.76  (*[
    1.77  (1 ,[1] ,true ,#Given ,Cor functionTerm (x ^^^ 2 + x + 1) ,(f_, [x ^^^ 2 + x + 1])),
    1.78  (2 ,[1] ,true ,#Given ,Cor differentiateFor x ,(v_, [x])),
    1.79 @@ -592,12 +592,12 @@
    1.80  (*("Isac.thy",
    1.81        ["derivative_of", "function"],
    1.82        ["diff", "differentiate_on_R"]) : spec*)
    1.83 -writeln (itms2str thy probl);
    1.84 +writeln (itms2str_ ctxt probl);
    1.85  (*[
    1.86  (1 ,[1] ,true ,#Given ,Cor functionTerm (x ^^^ 2 + x + 1) ,(f_, [x ^^^ 2 + x + 1])),
    1.87  (2 ,[1] ,true ,#Given ,Cor differentiateFor x ,(v_, [x])),
    1.88  (3 ,[1] ,true ,#Find ,Cor derivative f_'_ ,(f_'_, [f_'_]))]*)
    1.89 -writeln (itms2str thy meth);
    1.90 +writeln (itms2str_ ctxt meth);
    1.91  (*[
    1.92  (1 ,[1] ,true ,#Given ,Cor functionTerm (x ^^^ 2 + x + 1) ,(f_, [x ^^^ 2 + x + 1])),
    1.93  (2 ,[1] ,true ,#Given ,Cor differentiateFor x ,(v_, [x])),