# HG changeset patch # User Walther Neuper # Date 1311060610 -7200 # Node ID b11276f082942bc93aa148976cecc37a507a3cad # Parent 43dbf705d2f0b3a949e8e4b242f01bb5a2bf416a intermed: uncomment tests with CompleteCalc diff -r 43dbf705d2f0 -r b11276f08294 doc-src/isac/master_thesis_template.zip Binary file doc-src/isac/master_thesis_template.zip has changed diff -r 43dbf705d2f0 -r b11276f08294 doc-src/isac/template_master_thesis.zip Binary file doc-src/isac/template_master_thesis.zip has changed diff -r 43dbf705d2f0 -r b11276f08294 doc-src/isac/template_master_thesis_prelim.tex --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc-src/isac/template_master_thesis_prelim.tex Tue Jul 19 09:30:10 2011 +0200 @@ -0,0 +1,42 @@ +\documentclass{report} +\usepackage{a4} +\usepackage{times} +\usepackage{latexsym} +%\bibliographystyle{alpha} +\bibliographystyle{abbrv} +\usepackage{graphicx} + +\def\isac{${\cal I}\mkern-2mu{\cal S}\mkern-5mu{\cal AC}$} +\def\sisac{{\footnotesize${\cal I}\mkern-2mu{\cal S}\mkern-5mu{\cal AC}$}} + +\title{Tentative Title:\\ + TODO} +\author{n.n.\\ +{\tt TODO@xxx.at}} + +\begin{document} +\maketitle +\abstract{ +TODO +} + +\chapter{Background} + +\chapter{Goal} + +\chapter{State of the Art} + +\chapter{Thesis Structure} + +\chapter{Timeline} +Milestones + +\section{TODO} + +\section{TODO} + +\section{TODO} + + +%\bibliography{bib/TODO} +\end{document} diff -r 43dbf705d2f0 -r b11276f08294 test/Tools/isac/Knowledge/polyminus.sml --- a/test/Tools/isac/Knowledge/polyminus.sml Mon Jul 18 17:21:21 2011 +0200 +++ b/test/Tools/isac/Knowledge/polyminus.sml Tue Jul 19 09:30:10 2011 +0200 @@ -379,10 +379,12 @@ @@@@@WN081114 gives "??.empty", all "Pruefe" are the same, although analogies work in interface.sml: FIXME.WN081114 in "Pruefe"*) val ((pt,p),_) = get_calc 1; -(*========== inhibit exn 110310 ================================================ +(*========== inhibit exn 110719 ================================================ if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "11 = 11" then () else error "polyminus.sml: Probe 11 = 11"; show_pt pt; +============ inhibit exn 110719 ==============================================*) +(*========== inhibit exn 110719 ================================================ "----------- pbl klammer polynom vereinfachen p.34 ---------------"; @@ -414,6 +416,8 @@ if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "29 = 29" then () else error "polyminus.sml: Probe 29 = 29"; show_pt pt; +============ inhibit exn 110719 ==============================================*) +(*========== inhibit exn 110719 ================================================ "----------- try fun applyTactics --------------------------------"; @@ -478,7 +482,10 @@ (([9], Res), - (8 * g) + 10 * g + (3 - 2 * e + 2 * f)), (([], Res), - (8 * g) + 10 * g + (3 - 2 * e + 2 * f))] ~~~~~~~~~~~###~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*) +============ inhibit exn 110719 ==============================================*) +(*========== inhibit exn 110719 ================================================ +"#############################################################################"; states:=[]; CalcTree [(["Term (- (8 * g) + 10 * g + h)", "normalform N"], @@ -491,6 +498,7 @@ then () else error "polyminus.sml: addiere_vor_minus"; +"#############################################################################"; states:=[]; CalcTree [(["Term (- (8 * g) + 10 * g + f)", "normalform N"], @@ -502,6 +510,8 @@ if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "f + 2 * g" then () else error "polyminus.sml: tausche_vor_plus"; +============ inhibit exn 110719 ==============================================*) +(*========== inhibit exn 110719 ================================================ "----------- pbl binom polynom vereinfachen p.39 -----------------"; "----------- pbl binom polynom vereinfachen p.39 -----------------"; @@ -554,6 +564,7 @@ term2str (get_obj g_res pt (fst p)) = "1 + 14 * u" then () else error "polyminus.sml: Vereinfache (2*u - 5 - (3 - ..."; *) +============ inhibit exn 110719 ==============================================*) "----------- pbl binom polynom vereinfachen: cube ----------------"; @@ -566,7 +577,10 @@ moveActiveRoot 1; autoCalculate 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; +if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "12 * a - 16 * q" +then () else error "pbl binom polynom vereinfachen: cube"; +(*========== inhibit exn 110719 ================================================ "----------- refine Vereinfache ----------------------------------"; "----------- refine Vereinfache ----------------------------------"; @@ -659,4 +673,5 @@ (2, [1], "#Find", Const (...), [...])] : ori list *) -============ inhibit exn 110310 ==============================================*) +============ inhibit exn 110719 ==============================================*) + diff -r 43dbf705d2f0 -r b11276f08294 test/Tools/isac/Test_Some.thy --- a/test/Tools/isac/Test_Some.thy Mon Jul 18 17:21:21 2011 +0200 +++ b/test/Tools/isac/Test_Some.thy Tue Jul 19 09:30:10 2011 +0200 @@ -7,16 +7,13 @@ ML{* writeln "**** run the test ***************************************" *} -use"../../../test/Tools/isac/Frontend/interface.sml" +use"../../../test/Tools/isac/Knowledge/polyminus.sml" ML{* *} ML{* *} ML{* - -*} -ML{* *} ML{* *} @@ -30,8 +27,8 @@ ===== inhibit exn ?===========================================================*) -(*========== inhibit exn 110718 ================================================ -============ inhibit exn 110718 ==============================================*) +(*========== inhibit exn 110719 ================================================ +============ inhibit exn 110719 ==============================================*) (*-.-.-.-.-.-isolate response.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.