wneuper/isa: comparison test/Tools/isac/Knowledge/rational-old.sml

equal deleted inserted replaced

-:95d956108461
+:460c24a6a6ba
 (* tests*)
 print("\n\n*********************   tests    *************************\n\n");
 print("\n\n***** divide tests *****\n");
 val mv_pquot1 = (#1(mv_division([(1,[1,1,1]),(1,[1,1,0]),(1,[1,0,1]),(1,[0,0,0])],[(1,[1,1,0]),(1,[0,0,0])],LEX_)));
 (* result: [(1,[0,0,1]),(1,[0,0,0])] *)
-if mv_pquot1=[(1,[0,0,1]),(1,[0,0,0])] then () else raise error ("Test failed");
+if mv_pquot1=[(1,[0,0,1]),(1,[0,0,0])] then () else error ("Test failed");
 val mv_prest1 = (#2(mv_division([(1,[1,1,1]),(1,[1,1,0]),(1,[1,0,1]),(1,[0,0,0])],[(1,[1,1,0]),(1,[0,0,0])],LEX_)));
 (* result: [(1,[1,0,1]),(~1,[0,0,1])] *)
-if mv_prest1=[(1,[1,0,1]),(~1,[0,0,1])] then () else raise error ("Test failed");
+if mv_prest1=[(1,[1,0,1]),(~1,[0,0,1])] then () else error ("Test failed");
 val mv_pquot2 = (#1(mv_division([(4,[2]),(8,[1]),(16,[0])],[(1,[1]),(1,[0])],LEX_)));
 (* result: [(4,[1]),(4,[0])] *)
-if mv_pquot2=[(4,[1]),(4,[0])] then () else raise error ("Test failed");
+if mv_pquot2=[(4,[1]),(4,[0])] then () else error ("Test failed");
 val mv_prest2 = (#2(mv_division([(4,[2]),(8,[1]),(16,[0])],[(1,[1]),(1,[0])],LEX_)));
 (* result: [(12,[0]] *)
-if mv_prest2=[(12,[0])] then () else raise error ("Test failed");
+if mv_prest2=[(12,[0])] then () else error ("Test failed");
 val mv_pquot3 = (#1(mv_division([(4,[2]),(~4,[0])],[(2,[1]),(2,[0])],LEX_)));
 (* [(2,[1]),(~2,[0])] *)
-if mv_pquot3=[(2,[1]),(~2,[0])] then () else raise error ("Test failed");
+if mv_pquot3=[(2,[1]),(~2,[0])] then () else error ("Test failed");
 val mv_prest3 = (#2(mv_division([(1,[2]),(~1,[0])],[(2,[1]),(2,[0])],LEX_)));
 (* [(1,[2]),(~1,[0])] *)
-if mv_prest3=[(1,[2]),(~1,[0])] then () else raise error ("Test failed");
+if mv_prest3=[(1,[2]),(~1,[0])] then () else error ("Test failed");
 val mv_pquot4 = (#1(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1])],[(2,[1,0,0]),(4,[0,0,1])],LEX_)));
 (* [(1,[0,1,1])] *)
-if mv_pquot4=[(1,[0,1,1])] then () else raise error ("Test failed");
+if mv_pquot4=[(1,[0,1,1])] then () else error ("Test failed");
 val mv_prest4 = (#2(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1])],[(2,[1,0,0]),(4,[0,0,1])],GGO_)));
 (* [(1,[1,1,1]),(~4,[0,1,2]),(4,[1,0,1]),(3,[0,0,1])] *)
-if mv_prest4 =[(1,[1,1,1]),(~4,[0,1,2]),(4,[1,0,1]),(3,[0,0,1])] then () else raise error ("Test failed");
+if mv_prest4 =[(1,[1,1,1]),(~4,[0,1,2]),(4,[1,0,1]),(3,[0,0,1])] then () else error ("Test failed");
 val mv_pquot5 = (#1(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1]),(6,[2,1,3]),(4,[0,4,1]),(1,[2,2,1])],[(1,[0,0,1])],LEX_)));
 (* [(1,[2,2,0]),(6,[2,1,2]),(3,[1,1,0]),(4,[1,0,0]),(4,[0,4,0]),(3,[0,0,0])]*)
-if mv_pquot5=[(1,[2,2,0]),(6,[2,1,2]),(3,[1,1,0]),(4,[1,0,0]),(4,[0,4,0]),(3,[0,0,0])] then () else raise error ("Test failed");
+if mv_pquot5=[(1,[2,2,0]),(6,[2,1,2]),(3,[1,1,0]),(4,[1,0,0]),(4,[0,4,0]),(3,[0,0,0])] then () else error ("Test failed");
 val mv_prest5 = (#2(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1]),(6,[2,1,3]),(4,[0,4,1]),(1,[2,2,1])],[(1,[0,0,1])],LEX_)));
 (* [] *)
-if mv_prest5=[] then () else raise error ("Test failed");
+if mv_prest5=[] then () else error ("Test failed");
 (* (x^2 + 2(a+1)x + (a^2+2a+1)) / (x+a+1) = x+a+1 *)
 val mv_pquot6 = (#1(mv_division([(1,[2,0,0]),(2,[1,1,0]),(2,[1,0,0]),(1,[0,2,0]),(2,[0,1,0]),(1,[0,0,0])],[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])],LEX_)));
-if mv_pquot6=[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])] then () else raise error ("Test failed");
+if mv_pquot6=[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])] then () else error ("Test failed");
 val mv_prest6 = (#2(mv_division([(1,[2,0,0]),(2,[1,1,0]),(2,[1,0,0]),(1,[0,2,0]),(2,[0,1,0]),(1,[0,0,0])],[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])],LEX_)));
-if mv_prest6=[] then () else raise error ("Test failed");
+if mv_prest6=[] then () else error ("Test failed");
 (* Exception tests *)
 (* mv_division ([(1,[0,0,0])],[(0,[1,2,3])],LEX_); *)
 print("\n\n***** MV_CONTENT-TESTS *****\n");
 val mv_cont1=mv_content([(1,[2,1]),(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,1]),(1,[0,0])]);
 (* [(1,[0,1]),(1,[0,0])] *)
-if  mv_cont1=[(1,[0,1]),(1,[0,0])] then () else raise error ("Test failed");
+if  mv_cont1=[(1,[0,1]),(1,[0,0])] then () else error ("Test failed");
 val mv_pp1=mv_pp([(1,[1,1]),(1,[1,0]),(1,[0,1]),(1,[0,0])]);
 (*[(1,[1,0]),(1,[0,0])]*)
-if mv_pp1=[(1,[1,0]),(1,[0,0])] then () else raise error ("Test failed");
+if mv_pp1=[(1,[1,0]),(1,[0,0])] then () else error ("Test failed");
 val mv_cont2=mv_content([(2,[1]),(4,[0])]);
 (* [(2,[0])] *)
-if mv_cont2=[(2,[0])] then () else raise error ("Test failed");
+if mv_cont2=[(2,[0])] then () else error ("Test failed");
 val mv_pp2=mv_pp([(2,[1]),(4,[0])]);
 (* [(1,[1]),(2,[0])] *)
-if mv_pp2=[(1,[1]),(2,[0])] then () else raise error ("Test failed");
+if mv_pp2=[(1,[1]),(2,[0])] then () else error ("Test failed");
 val mv_cont3=mv_content[(8,[2,1,1]),(12,[1,0,2]),(10,[2,2,0]),(16,[1,1,1])];
 (* [(2,[0,0,0])] *)
-if mv_cont3=[(2,[0,0,0])] then () else raise error ("Test failed");
+if mv_cont3=[(2,[0,0,0])] then () else error ("Test failed");
 val mv_pp3=mv_pp[(8,[2,1,1]),(12,[1,0,2]),(10,[2,2,0]),(16,[1,1,1])];
 (* [(5,[2,2,0]),(4,[2,1,1]),(8,[1,1,1]),(6,[1,0,2])] *)
-if mv_pp3=[(5,[2,2,0]),(4,[2,1,1]),(8,[1,1,1]),(6,[1,0,2])] then () else raise error ("Test failed");
+if mv_pp3=[(5,[2,2,0]),(4,[2,1,1]),(8,[1,1,1]),(6,[1,0,2])] then () else error ("Test failed");
 val mv_cont4=mv_content[(2,[2,1,0]),(3,[1,0,1]),(2,[1,1,0]),(3,[0,0,1])];
 (* [(1,[0,0,0])] *)
-if mv_cont4=[(1,[0,0,0])] then () else raise error ("Test failed");
+if mv_cont4=[(1,[0,0,0])] then () else error ("Test failed");
 val mv_pp4=mv_pp [(2,[2,1,0]),(3,[1,0,1]),(2,[1,1,0]),(3,[0,0,1])];
 (* [(2,[2,1,0]),(2,[1,1,0]),(3,[1,0,1]),(3,[0,0,1])] *)
-if mv_pp4=[(2,[2,1,0]),(2,[1,1,0]),(3,[1,0,1]),(3,[0,0,1])] then () else raise error ("Test failed");
+if mv_pp4=[(2,[2,1,0]),(2,[1,1,0]),(3,[1,0,1]),(3,[0,0,1])] then () else error ("Test failed");
 val con1=mv_content([(9,[2,0]),(15,[1,1]),(12,[1,0]),(6,[0,2]),(12,[0,1])]);
 (* [(3,[0,0])] *)
-if con1=[(3,[0,0])] then () else raise error ("Test failed");
+if con1=[(3,[0,0])] then () else error ("Test failed");
 val pp1=mv_pp([(9,[2,0]),(15,[1,1]),(12,[1,0]),(6,[0,2]),(12,[0,1])]);
 (* [(3,[2,0]),(5,[1,1]),(4,[1,0]),(2,[0,2]),(4,[0,1])] *)
-if pp1=[(3,[2,0]),(5,[1,1]),(4,[1,0]),(2,[0,2]),(4,[0,1])] then () else raise error ("Test failed");
+if pp1=[(3,[2,0]),(5,[1,1]),(4,[1,0]),(2,[0,2]),(4,[0,1])] then () else error ("Test failed");
 val con2=mv_content([(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])]);
 (* [(1,[0,0])] *)
-if con2=[(1,[0,0])] then () else raise error ("Test failed");
+if con2=[(1,[0,0])] then () else error ("Test failed");
 val pp2 =mv_pp([(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])]);
 (* [(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])] *)
-if pp2=[(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])] then () else raise error ("Test failed");
+if pp2=[(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])] then () else error ("Test failed");
 val cont1 = mv_content [(1,[2,1,0]),(2,[2,1,0])];
 (* [(3,[0,1,0])] *)
-if cont1=[(3,[0,1,0])] then () else raise error ("Test failed");
+if cont1=[(3,[0,1,0])] then () else error ("Test failed");
 val pp1 = mv_pp [(1,[2,1,0]),(2,[2,1,0])];
 (* [(1,[2,0,0])] *)
-if pp1=[(1,[2,0,0])] then () else raise error ("Test failed");
+if pp1=[(1,[2,0,0])] then () else error ("Test failed");
 val cont2 = mv_content [(4,[1,2,0]),(2,[2,1,0])];
 (* [(2,[0,1,0])] *)
-if cont2=[(2,[0,1,0])] then () else raise error ("Test failed");
+if cont2=[(2,[0,1,0])] then () else error ("Test failed");
 val pp2 = mv_pp [(4,[1,2,0]),(2,[2,1,0])];
 (* [(1,[2,0,0]),(2,[1,1,0])] *)
-if pp2=[(1,[2,0,0]),(2,[1,1,0])] then () else raise error ("Test failed");
+if pp2=[(1,[2,0,0]),(2,[1,1,0])] then () else error ("Test failed");
 print("\n\n\n\n********************************************************\n\n");
 val cont3=mv_content [(65,[3,2,2]),(52,[3,2,1]),(26,[3,1,2]),(~95,[2,2,3]),(~76,[2,2,2]),(35,[2,2,1]),(28,[2,2,0]),(~38,[2,1,3]),(14,[2,1,1])];
-(*if cont3=[(1,[0,1,0])] then () else raise error ("Test failed"); *)
+(*if cont3=[(1,[0,1,0])] then () else error ("Test failed"); *)
 val pp3=mv_pp [(65,[3,2,2]),(52,[3,2,1]),(26,[3,1,2]),(~95,[2,2,3]),(~76,[2,2,2]),(35,[2,2,1]),(28,[2,2,0]),(~38,[2,1,3]),(14,[2,1,1])];
 print("\n\n***** gcd-tests *****\n");
 val ggt1 = gcd_poly [(4,[2,2]),(8,[1,1]),(4,[0,0])] [(2,[1,1]),(2,[0,0])];
 (* [(2,[1,1]),(2,[0,0])] *)
-if ggt1=[(2,[1,1]),(2,[0,0])] then () else raise error ("Test failed");
+if ggt1=[(2,[1,1]),(2,[0,0])] then () else error ("Test failed");
 val ggt2 = gcd_poly [(8,[2,1,1]),(12,[1,0,2]),(10,[2,2,0]),(15,[1,1,1])] [(2,[2,1,0]),(3,[1,0,1]),(2,[1,1,0]),(3,[0,0,1])];
 (* [(2,[1,1,0]),(3,[0,0,1])] *)
-if ggt2=[(2,[1,1,0]),(3,[0,0,1])] then () else raise error ("Test failed");
+if ggt2=[(2,[1,1,0]),(3,[0,0,1])] then () else error ("Test failed");
 val ggt3 = gcd_poly [(1,[2,0,0]),(~2,[1,0,1]),(1,[0,0,2])] [(1,[1,0,0]),(~1,[0,0,1])];
 (* [(1,[1,0,0]),(~1,[0,0,1])] *)
-if ggt3=[(1,[1,0,0]),(~1,[0,0,1])] then () else raise error ("Test failed");
+if ggt3=[(1,[1,0,0]),(~1,[0,0,1])] then () else error ("Test failed");
 val ggt4 = gcd_poly [(1,[2,1,0]),(2,[2,1,0])] [(5,[1,0,0])];
 (* [(1,[1,0,0])] *)
-if ggt4=[(1,[1,0,0])] then () else raise error ("Test failed");
+if ggt4=[(1,[1,0,0])] then () else error ("Test failed");
 val ggt5 = gcd_poly [(4,[2,0,0]),(~8,[1,0,1]),(4,[0,0,2])] [(1,[2,0,0]),(~1,[0,0,2])];
 (* [(1,[1,0,0]),(~1,[0,0,1])] *)
-if ggt5=[(1,[1,0,0]),(~1,[0,0,1])] then () else raise error ("Test failed");
+if ggt5=[(1,[1,0,0]),(~1,[0,0,1])] then () else error ("Test failed");
 val ggt6 = gcd_poly [(10,[2,1,1]),(14,[1,1,0]),(3,[1,0,1]),(20,[1,2,1])] [(5,[1,1,1]),(7,[2,1,1])];
 (* [(1,[0,0,0])] *)
-if ggt6=[(1,[1,0,0])] then () else raise error ("Test failed");
+if ggt6=[(1,[1,0,0])] then () else error ("Test failed");
 val ggt7 = gcd_poly [(~169,[4,3,3]),(273,[4,2,2]),(247,[3,3,4]),(~91,[3,3,2]),(78,[3,3,1]),(~399,[3,2,3]),(147,[3,2,1]),(~114,[2,3,2]),(42,[2,3,0])]  [(65,[3,2,2]),(52,[3,2,1]),(26,[3,1,2]),(~95,[2,2,3]),(~76,[2,2,2]),(35,[2,2,1]),(28,[2,2,0]),(~38,[2,1,3]),(14,[2,1,1])];
 (* [(13,[3,1,1]),(~19,[2,1,2]),(7,[2,1,0])] *)
-if ggt7=[(13,[3,1,1]),(~19,[2,1,2]),(7,[2,1,0])] then () else raise error ("Test failed");
+if ggt7=[(13,[3,1,1]),(~19,[2,1,2]),(7,[2,1,0])] then () else error ("Test failed");
 print("\n\n***** kgv-tests *****\n");
 val kgv1=lcm_poly [(10,[])] [(15,[])];
 (* [(30,[])] *)
-if kgv1=[(30,[])] then () else raise error ("Test failed");
+if kgv1=[(30,[])] then () else error ("Test failed");
 val kgv2=lcm_poly [(1,[2,0,0]),(~2,[1,0,1]),(1,[0,0,2])] [(1,[1,0,0]),(~1,[0,0,1])];
 (* [(1,[2,0,0]),(~2,[1,0,1]),(1,[0,0,2])] *)
-if kgv2=[(1,[2,0,0]),(~2,[1,0,1]),(1,[0,0,2])] then () else raise error ("Test failed");
+if kgv2=[(1,[2,0,0]),(~2,[1,0,1]),(1,[0,0,2])] then () else error ("Test failed");
 val kgv3=lcm_poly [(4,[2,0,0]),(~8,[1,0,1]),(4,[0,0,2])] [(1,[2,0,0]),(~1,[0,0,2])];
 (* [(4,[3,0,0]),(~4,[2,0,1]),(~4,[1,0,2]),(4,[0,0,3])] *)
-if kgv3=[(4,[3,0,0]),(~4,[2,0,1]),(~4,[1,0,2]),(4,[0,0,3])] then () else raise error ("Test failed");
+if kgv3=[(4,[3,0,0]),(~4,[2,0,1]),(~4,[1,0,2]),(4,[0,0,3])] then () else error ("Test failed");
 (*
 print("***** TERM2POLY-TESTS *****\n");
 val t0 = (term_of o the o (parse thy)) "3 * 4";
 val t1 = (term_of o the o (parse thy)) "27";
 atomt div2;
 *)
 val term1 = (term_of o the o (parse thy)) "(10 * a^^^2 * b * c + 14 * a * b + 3 * a * c + 20 * a * b^^^2 * c) /// a";
 val div1  = step_cancel term1;
-(*if div1 =  (term_of o the o (parse thy)) "((10 * a * b * c + 14 * b + 3 * c + 20 * b^^^2 * c) * a) /// (1 * a)" then () else raise raise error ("Test failed");*)
+(*if div1 =  (term_of o the o (parse thy)) "((10 * a * b * c + 14 * b + 3 * c + 20 * b^^^2 * c) * a) /// (1 * a)" then () else raise error ("Test failed");*)
 val term2 = (term_of o the o (parse thy)) "(10 * a^^^2 * b * c + 14 * a * b + 3 * a * c + 20 * a * b^^^2 * c) /// (5 * a * b * c  +  7 * a^^^2 * b * c) ";
 val div2  = step_cancel term2;
-(*if div2 = ([(10,[1,1,1]),(20,[0,2,1]),(14,[0,1,0]),(3,[0,0,1])],[(1,[1,0,0])],[(7,[1,1,1]),(5,[0,1,1])]) then () else raise raise error ("Test failed");*)
+(*if div2 = ([(10,[1,1,1]),(20,[0,2,1]),(14,[0,1,0]),(3,[0,0,1])],[(1,[1,0,0])],[(7,[1,1,1]),(5,[0,1,1])]) then () else raise error ("Test failed");*)
 val term3 = (term_of o the o (parse thy)) "(10 * a^^^2 * b * c) /// (1 * x * y * z) ";
 val div3 = step_cancel term3;
 val mul2=(the (term2poly((term_of o the o (parse thy)) "13*a^^^2*b*c+7*a*b-19*a*b*c^^^2")));
 val mul3=(the (term2poly((term_of o the o (parse thy)) "6*a*b^^^2-13*a^^^2*b^^^2*c^^^2+21*a^^^2*b*c")));
 val t1=mv_mul(mul1,mul2,LEX_);
 val t2=mv_mul(mul3,mul2,LEX_);
 val div3=step_cancel t1 t2;
-if div3=([(5,[0,1,1]),(4,[0,1,0]),(2,[0,0,1])],[(13,[3,1,1]),(~19,[2,1,2]),(7,[2,1,0])],[(~13,[1,2,2]),(21,[1,1,1]),(6,[0,2,0])]) then () else raise error ("Test failed");*)
+if div3=([(5,[0,1,1]),(4,[0,1,0]),(2,[0,0,1])],[(13,[3,1,1]),(~19,[2,1,2]),(7,[2,1,0])],[(~13,[1,2,2]),(21,[1,1,1]),(6,[0,2,0])]) then () else error ("Test failed");*)
 print("\n\n***** all tests successfull ;-) ******\n\n");
 val thy' = "Rational";
 val rls' = "cancel";
 val t' = "(1 + 1 * a ^^^ 1)///(-2 + 2 * a ^^^ 2)";
 val (t',asm') = the (rewrite_set thy' "eval_rls" false rls' t');
 (*if t' = "1 /// (-2 + 2 * a)" then ()
-else raise error "tests/rationals.sml(1): new behaviour";*)
+else error "tests/rationals.sml(1): new behaviour";*)
 val thy' = "Rational";
 val rls' = "cancel";
 val t' = "(10 * a^^^2 * b * c + 14 * a * b + 3 * a * c + 20 * a * b^^^2 * c) /// (5 * a * b * c  +  7 * a^^^2 * b * c) ";
 print("a)\n");
 val e188a'="(8 * x + -8) / (9 * x + -9 )";
 val e188a = the (rewrite_set thy' "rational_erls" false rls' e188a');
 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "(8*((-1) + x))/(9*((-1) + x))";
 if t="((-8) + 8 * x) / ((-9) + 9 * x)"then()
-else raise error "rationals.sml: e188a new behaviour";
+else error "rationals.sml: e188a new behaviour";
 print("b)\n");
 val e188b'="(5 * x + -15) / (6 * x + -18 )";
 val e188b = the (rewrite_set thy' "rational_erls" false rls' e188b');
 print("c)\n");
 val e188c'="( a + -1 * b ) / ( b + -1 * a )";
 val e188c = the (rewrite_set thy' "rational_erls" false rls' e188c');
 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "((-1)*(b + (-1) * a))/(1*(b + (-1) * a))";
 if t="(a + -1 * b) / (b + -1 * a)"then()
-else raise error "rationals.sml: e188c new behaviour";
+else error "rationals.sml: e188c new behaviour";
 print("\n\nexample 190:\n");
 print("c)\n");
 val e190c'="( 27 * a^^^3 + 9 * a^^^2 + 3 * a + 1 ) / ( 27 * a^^^3 + 18 * a^^^2 + 3 * a )";
 val e190c = the (rewrite_set thy' "rational_erls" false rls' e190c');
 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "((1 + 9 * a ^^^ 2)*(1 + 3 * a))/((3 * a + 9 * a ^^^ 2)*(1 + 3 * a))";
 if t="(1 + (3 * a + (27 * a ^^^ 3 + 9 * a ^^^ 2))) /\n(3 * a + (18 * a ^^^ 2 + 27 * a ^^^ 3))"then()
 (*TERMORDER               ~~~~~~~       ~~~~~~~*)
-else raise error "rationals.sml: e190c new behaviour";
+else error "rationals.sml: e190c new behaviour";
 print("\n\nexample 191:\n");
 print("a)\n");
 val e191a'="( x^^^2 + -1 * y^^^2 ) / ( x + y )";
 val e191a = the (rewrite_set thy' "rational_erls" false rls' e191a');
 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "((x + (-1) * y)*(x + y))/((1)*(x + y))";
 if t="(x ^^^ 2 + -1 * y ^^^ 2) / (x + y)"then()
-else raise error "rationals.sml: e191a new behaviour";
+else error "rationals.sml: e191a new behaviour";
 print("c)\n");
 val e191c'="( 9 * x^^^2 + -30 * x + 25 ) / ( 9 * x^^^2 + -25 )";
 val e191c = the (rewrite_set thy' "rational_erls" false rls' e191c');
 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "(((-5) + 3 * x)*((-5) + 3 * x))/((5 + 3 * x)*((-5) + 3 * x))";
 if t="(25 + ((-30) * x + 9 * x ^^^ 2)) / ((-25) + 9 * x ^^^ 2)"then()
-else raise error "rationals.sml: 'e191c' new behaviour";
+else error "rationals.sml: 'e191c' new behaviour";
 print("\n\nexample 192:\n");
 print("b)\n");
 val e192b'="( 7 * x^^^3 + -1 * x^^^2 * y ) / ( 7 * x * y^^^2 + -1 *  y^^^3 )";
 val e192b = the (rewrite_set thy' "rational_erls" false rls' e192b');
 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "((x ^^^ 2)*(7 * x + (-1) * y))/((y ^^^ 2)*(7 * x + (-1) * y))";
 if t="(7 * x ^^^ 3 + -1 * (y * x ^^^ 2)) / (-1 * y ^^^ 3 + 7 * (x * y ^^^ 2))"then()
 (*TERMORDER                ~~~~~*)
-else raise error "rationals.sml: 'e192b' new behaviour";
+else error "rationals.sml: 'e192b' new behaviour";
 print("\n\nexample 193:\n");
 print("a)\n");
 val e193a'="( x^^^2 + -6 * x + 9 ) / ( x^^^2 + -9 )";
 val e193a = the (rewrite_set thy' "rational_erls" false rls' e193a');
 print("\n\nexample stiefel:\n");
 val est1'="(7) / (-14) + (-2) / (4)";
 val est1 = the (rewrite_set thy' "rational_erls" false rls' est1');
 if est1 = ("(-1) / 1",[]) then ()
-else raise error "new behaviour in rationals.sml: est1'";
+else error "new behaviour in rationals.sml: est1'";
 -------------------------------------------------------------------------*)
 (*
 val t = (term_of o the o (parse thy))
 val SOME r = nex revsets t;
 val (r,(t,asm))::_ = loc revsets t r;
 val ss = term2str t;
 if ss = "(3 - x) / (3 + x)" then ()
-else raise error "rational.sml: new behav. in rev-set cancel";
+else error "rational.sml: new behav. in rev-set cancel";
 terms2str asm;
 (*WN.11.9.02: the 'reverse-ruleset' cancel*)

branch	isac-update-Isa09-2
changeset 38031	460c24a6a6ba
parent 37991	028442673981
child 38043	6a36acec95d9