1.1 --- a/test/Tools/isac/Knowledge/polyeq-1.sml	Tue May 12 17:42:29 2020 +0200
     1.2 +++ b/test/Tools/isac/Knowledge/polyeq-1.sml	Wed May 13 11:34:05 2020 +0200
     1.3 @@ -109,22 +109,22 @@
     1.4  "----------- test matching problems --------------------------0---";
     1.5  "----------- test matching problems --------------------------0---";
     1.6  val fmz = ["equality (-8 - 2*x + x^^^2 = 0)", "solveFor x","solutions L"];
     1.7 -if match_pbl fmz (Problem.from_store ["expanded","univariate","equation"]) =
     1.8 -  Matches' {Find = [Correct "solutions L"], 
     1.9 +if Model.match_pbl fmz (Problem.from_store ["expanded","univariate","equation"]) =
    1.10 +  Model.Matches' {Find = [Correct "solutions L"], 
    1.11              With = [], 
    1.12              Given = [Correct "equality (-8 - 2 * x + x ^^^ 2 = 0)", Correct "solveFor x"], 
    1.13              Where = [Correct "matches (?a = 0) (-8 - 2 * x + x ^^^ 2 = 0)", 
    1.14                       Correct "lhs (-8 - 2 * x + x ^^^ 2 = 0) is_expanded_in x"], 
    1.15              Relate = []}
    1.16 -then () else error "match_pbl [expanded,univariate,equation]";
    1.17 +then () else error "Model.match_pbl [expanded,univariate,equation]";
    1.18  
    1.19 -if match_pbl fmz (Problem.from_store ["degree_2","expanded","univariate","equation"]) =
    1.20 -  Matches' {Find = [Correct "solutions L"], 
    1.21 +if Model.match_pbl fmz (Problem.from_store ["degree_2","expanded","univariate","equation"]) =
    1.22 +  Model.Matches' {Find = [Correct "solutions L"], 
    1.23              With = [], 
    1.24              Given = [Correct "equality (-8 - 2 * x + x ^^^ 2 = 0)", Correct "solveFor x"], 
    1.25              Where = [Correct "lhs (-8 - 2 * x + x ^^^ 2 = 0) has_degree_in x = 2"], 
    1.26              Relate = []}              (*before WN110906 was: has_degree_in x =!= 2"]*)
    1.27 -then () else error "match_pbl [degree_2,expanded,univariate,equation]";
    1.28 +then () else error "Model.match_pbl [degree_2,expanded,univariate,equation]";
    1.29  
    1.30  
    1.31  "----------- prep. for introduction of Matthias Goldgruber 2003 trials on rewrite orders -----";