Changeset 15ca3f3 in tol

Timestamp:

Mar 13, 2012, 9:34:06 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

a0e20ba

Parents:

00a4751

Message:

Include with errors returns nothing instead of empty set

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4349 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol_tests/tol/Bugzilla

Files:

• bug_000511/test.tol (modified) (1 diff)
• bug_000760/test.tol (modified) (2 diffs)
• bug_000907/model/master.bsr.config.oza (modified) (previous)
• bug_000907/model/master.bsr.mcmc.bbm (modified) (previous)
• bug_000907/model/master.bsr.recover.oza (modified) (previous)
• bug_000951/y2010m07d27h12i35s14.00/master.bsr.config.oza (modified) (previous)
• bug_000951/y2010m07d27h12i35s14.00/master.bsr.mcmc.bbm (modified) (previous)
• bug_000951/y2010m07d27h12i35s14.00/master.bsr.recover.oza (modified) (previous)
• bug_001230/check.tol (modified) (1 diff)
• bug_001451/check.03.tol (modified) (1 diff)
• bug_001451/ser.oza (modified) (previous)
• bug_001451/test.tol (modified) (1 diff)
• bug_001471/ser.oza (modified) (previous)
• bug_001475/test.tol (modified) (2 diffs)

tol_tests/tol/Bugzilla/bug_000511/test.tol

@@ -20 +20 @@
   Set partialResults_ = 
   [[
-    Real okErr = numErr1 == numErr0+1
+    Real okErr = numErr1 > numErr0
   ]];
 

tol_tests/tol/Bugzilla/bug_000760/test.tol

@@ -18 +18 @@
   Set aux = Include("file.tol");
 
-  Real ok = Card(aux)==0;
+  Real ok = !ObjectExist("Set","aux");
 
   Real numErr1 = Copy(NError);
@@ -26 +26 @@
 
 //This is a messure of the success of the test 
-  Real quality_ = And(numErr1 == numErr0+1, 
+  Real quality_ = And(numErr1 > numErr0, 
                       numWar1 == numWar0, ok);
 

tol_tests/tol/Bugzilla/bug_001230/check.tol

@@ -4 +4 @@
 Set aia.2 = ShowAia(AIA(example::serie,example::piw,outliers, 3, 100)); 
 Set aia.3 = ShowAia(AIA(example::serie,example::piw,outliers, 1)); 
-Set aia.4 = ShowAia(AIA(example::serie,example::piw,outliers, 5, 100, 0.99)); 
-Set aia.5 = ShowAia(AIA(example::serie,example::piw,outliers, 5, 100, 0.99, 200)); 
+Set aia.4 = ShowAia(AIA(example::serie,example::piw,outliers, 4, 100, 0.99)); 
+Set aia.5 = ShowAia(AIA(example::serie,example::piw,outliers, 2, 100, 0.9)); 
 
 //Reconstruyo la serie original para echarle un vistazo

tol_tests/tol/Bugzilla/bug_001451/check.03.tol

@@ -1 @@
-//Set Include("check.01.tol");
+Set Include("check.01.tol");
 Set Include("ser.oza");
 

tol_tests/tol/Bugzilla/bug_001451/test.tol

@@ -14 +14 @@
 Real numWar0 = Copy(NWarning);
 
-#Embed "check.02.tol";
-
+Set aux.1 = { Include("check.02.tol") };
 
 Real numErr1 = Copy(NError);
 Real numWar1 = Copy(NWarning);
 
+Set aux.2 = { Include("check.03.tol") };
+
+Real numErr2 = Copy(NError);
+Real numWar2 = Copy(NWarning);
+
 Set partialResults_ = [[ 
-  numErr0,numErr1,numWar1,numWar0,ok]];
+  numErr0,numErr1,numErr2,numWar0,numWar1,numWar2]];
 
 //This is a messure of the success of the test 
 Real quality_ = And(
-  numWar0 == numWar1,
-  numErr1 == numErr0, ok);
+  numWar0 <  numWar1,
+  numErr0 == numErr1,
+  numWar1 == numWar2,
+  numErr1 == numErr2);
 
 //Return the results 

tol_tests/tol/Bugzilla/bug_001475/test.tol

@@ -5 +5 @@
 //////////////////////////////////////////////////////////////////////////////
 
+Set  {
 //Sets the bugzilla identifier number, your e-mail and the bugŽs summary
 Real bugNum_ =  1475;
@@ -59 +60 @@
                  email_);
 WriteLn(""<<resultStr_);
-resultStr_;
-
+resultStr_
+}
 /* */