intermed: uncomment tests with CompleteCalc decompose-isar
authorWalther Neuper <neuper@ist.tugraz.at>
Tue, 19 Jul 2011 09:30:10 +0200
branchdecompose-isar
changeset 42107b11276f08294
parent 42106 43dbf705d2f0
child 42109 cd33f1f80c8a
child 42122 cc5daace30bb
intermed: uncomment tests with CompleteCalc
doc-src/isac/master_thesis_template.zip
doc-src/isac/template_master_thesis.zip
doc-src/isac/template_master_thesis_prelim.tex
test/Tools/isac/Knowledge/polyminus.sml
test/Tools/isac/Test_Some.thy
     1.1 Binary file doc-src/isac/master_thesis_template.zip has changed
     2.1 Binary file doc-src/isac/template_master_thesis.zip has changed
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/doc-src/isac/template_master_thesis_prelim.tex	Tue Jul 19 09:30:10 2011 +0200
     3.3 @@ -0,0 +1,42 @@
     3.4 +\documentclass{report}
     3.5 +\usepackage{a4}
     3.6 +\usepackage{times}
     3.7 +\usepackage{latexsym}
     3.8 +%\bibliographystyle{alpha}
     3.9 +\bibliographystyle{abbrv}
    3.10 +\usepackage{graphicx}
    3.11 +
    3.12 +\def\isac{${\cal I}\mkern-2mu{\cal S}\mkern-5mu{\cal AC}$}
    3.13 +\def\sisac{{\footnotesize${\cal I}\mkern-2mu{\cal S}\mkern-5mu{\cal AC}$}}
    3.14 +
    3.15 +\title{Tentative Title:\\
    3.16 +  TODO}
    3.17 +\author{n.n.\\
    3.18 +{\tt TODO@xxx.at}}
    3.19 +
    3.20 +\begin{document}
    3.21 +\maketitle
    3.22 +\abstract{
    3.23 +TODO
    3.24 +}
    3.25 +
    3.26 +\chapter{Background}
    3.27 +
    3.28 +\chapter{Goal}
    3.29 +
    3.30 +\chapter{State of the Art}
    3.31 +
    3.32 +\chapter{Thesis Structure}
    3.33 +
    3.34 +\chapter{Timeline}
    3.35 +Milestones
    3.36 +
    3.37 +\section{TODO}
    3.38 +
    3.39 +\section{TODO}
    3.40 +
    3.41 +\section{TODO}
    3.42 +
    3.43 +
    3.44 +%\bibliography{bib/TODO}
    3.45 +\end{document}
     4.1 --- a/test/Tools/isac/Knowledge/polyminus.sml	Mon Jul 18 17:21:21 2011 +0200
     4.2 +++ b/test/Tools/isac/Knowledge/polyminus.sml	Tue Jul 19 09:30:10 2011 +0200
     4.3 @@ -379,10 +379,12 @@
     4.4  @@@@@WN081114 gives "??.empty", all "Pruefe" are the same,
     4.5  although analogies work in interface.sml: FIXME.WN081114 in "Pruefe"*)
     4.6  val ((pt,p),_) = get_calc 1;
     4.7 -(*========== inhibit exn 110310 ================================================
     4.8 +(*========== inhibit exn 110719 ================================================
     4.9  if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "11 = 11"
    4.10  then () else error "polyminus.sml: Probe 11 = 11";
    4.11  show_pt pt;
    4.12 +============ inhibit exn 110719 ==============================================*)
    4.13 +(*========== inhibit exn 110719 ================================================
    4.14  
    4.15  
    4.16  "----------- pbl klammer polynom vereinfachen p.34 ---------------";
    4.17 @@ -414,6 +416,8 @@
    4.18  if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "29 = 29"
    4.19  then () else error "polyminus.sml: Probe 29 = 29";
    4.20  show_pt pt;
    4.21 +============ inhibit exn 110719 ==============================================*)
    4.22 +(*========== inhibit exn 110719 ================================================
    4.23  
    4.24  
    4.25  "----------- try fun applyTactics --------------------------------";
    4.26 @@ -478,7 +482,10 @@
    4.27  (([9], Res), - (8 * g) + 10 * g + (3 - 2 * e + 2 * f)),
    4.28  (([], Res), - (8 * g) + 10 * g + (3 - 2 * e + 2 * f))]
    4.29  ~~~~~~~~~~~###~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*)
    4.30 +============ inhibit exn 110719 ==============================================*)
    4.31 +(*========== inhibit exn 110719 ================================================
    4.32  
    4.33 +"#############################################################################";
    4.34  states:=[];
    4.35  CalcTree [(["Term (- (8 * g) + 10 * g + h)",
    4.36  	    "normalform N"],
    4.37 @@ -491,6 +498,7 @@
    4.38  then () else error "polyminus.sml: addiere_vor_minus";
    4.39  
    4.40  
    4.41 +"#############################################################################";
    4.42  states:=[];
    4.43  CalcTree [(["Term (- (8 * g) + 10 * g + f)",
    4.44  	    "normalform N"],
    4.45 @@ -502,6 +510,8 @@
    4.46  if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "f + 2 * g"
    4.47  then () else error "polyminus.sml: tausche_vor_plus";
    4.48  
    4.49 +============ inhibit exn 110719 ==============================================*)
    4.50 +(*========== inhibit exn 110719 ================================================
    4.51  
    4.52  "----------- pbl binom polynom vereinfachen p.39 -----------------";
    4.53  "----------- pbl binom polynom vereinfachen p.39 -----------------";
    4.54 @@ -554,6 +564,7 @@
    4.55     term2str (get_obj g_res pt (fst p)) = "1 + 14 * u"
    4.56  then () else error "polyminus.sml: Vereinfache (2*u - 5 - (3 - ...";
    4.57  *)
    4.58 +============ inhibit exn 110719 ==============================================*)
    4.59  
    4.60  
    4.61  "----------- pbl binom polynom vereinfachen: cube ----------------";
    4.62 @@ -566,7 +577,10 @@
    4.63  moveActiveRoot 1;
    4.64  autoCalculate 1 CompleteCalc;
    4.65  val ((pt,p),_) = get_calc 1; show_pt pt;
    4.66 +if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "12 * a - 16 * q" 
    4.67 +then () else error "pbl binom polynom vereinfachen: cube";
    4.68  
    4.69 +(*========== inhibit exn 110719 ================================================
    4.70  
    4.71  "----------- refine Vereinfache ----------------------------------";
    4.72  "----------- refine Vereinfache ----------------------------------";
    4.73 @@ -659,4 +673,5 @@
    4.74      (2, [1], "#Find", Const (...), [...])]
    4.75     : ori list
    4.76  *)
    4.77 -============ inhibit exn 110310 ==============================================*)
    4.78 +============ inhibit exn 110719 ==============================================*)
    4.79 +
     5.1 --- a/test/Tools/isac/Test_Some.thy	Mon Jul 18 17:21:21 2011 +0200
     5.2 +++ b/test/Tools/isac/Test_Some.thy	Tue Jul 19 09:30:10 2011 +0200
     5.3 @@ -7,16 +7,13 @@
     5.4  
     5.5  ML{* writeln "**** run the test ***************************************" *}
     5.6  
     5.7 -use"../../../test/Tools/isac/Frontend/interface.sml"
     5.8 +use"../../../test/Tools/isac/Knowledge/polyminus.sml"  
     5.9  
    5.10  ML{*
    5.11  *}
    5.12  ML{*
    5.13  *}
    5.14  ML{*
    5.15 -
    5.16 -*}
    5.17 -ML{*
    5.18  *}
    5.19  ML{*
    5.20  *}
    5.21 @@ -30,8 +27,8 @@
    5.22  ===== inhibit exn ?===========================================================*)
    5.23  
    5.24  
    5.25 -(*========== inhibit exn 110718 ================================================
    5.26 -============ inhibit exn 110718 ==============================================*)
    5.27 +(*========== inhibit exn 110719 ================================================
    5.28 +============ inhibit exn 110719 ==============================================*)
    5.29  
    5.30  
    5.31  (*-.-.-.-.-.-isolate response.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.