Changeset 613eadb in tol for tol_tests

Timestamp:

Nov 24, 2008, 5:26:10 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

08a679e

Parents:

cfa65b3

Message:

Bug 608 was lost and renamed as 610

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

File:

• tol_tests/tol/Bugzilla/bug_000608/test.tol (modified) (3 diffs)

tol_tests/tol/Bugzilla/bug_000608/test.tol

@@ -8 +8 @@
   Real bugNum_ =  608;
   Text email_ = "vdebuen@tol-project.org"; 
-  Text summary_ = "TimeSet Succ bug...";
+  Text summary_ = "BinGroup error ...";
   Text link_ = GetTolBugzillaLink(bugNum_);
 
@@ -14 +14 @@
   Real numErr0 = Copy(NError);
   
-  TimeSet CtSem445 =
-  D(1)*M(1)+WD(6)-(D(2)+D(3))*M(1)-(D(31)+D(30)+D(29)+D(28)+D(27))*M(12);
-  
-  Set Sem445 = Dates(CtSem445,y2007,y2009);
+  TimeSet tms.1 = BinGroup("Union", EvalSet(SetOfSerie(SubSer(CalInd(WD(7),Diario), y2008, y2009)), 
+    TimeSet(Serie sr)  { SerTms(Not(IsUnknown(sr))) }));
+  TimeSet tms.2 = BinGroup("+", EvalSet(SetOfSerie(SubSer(CalInd(WD(7),Diario), y2008, y2009)), 
+    TimeSet(Serie sr)  { SerTms(Not(IsUnknown(sr))) }));
+  TimeSet tms.3 = Group("Union", EvalSet(SetOfSerie(SubSer(CalInd(WD(7),Diario), y2008, y2009)), 
+    TimeSet(Serie sr)  { SerTms(Not(IsUnknown(sr))) }));
 
-  TimeSet tmsucc1 = Succ(M(1)*D(1),1, CtSem445 );
- //Works Ok,  tmsucc1 *Y (2008) = y2008m01d05
-  Set Sem445.1 = Dates(tmsucc1,y2007,y2009);
-  Real ok.1.1 = Belong(y2008m01d05,tmsucc1);
-  Real ok.1.2 = y2008m01d05 <: Sem445.1;
-  Real ok.1.3 = Dates(tmsucc1 *Y (2008), y2008,y2008m2) == [[y2008m01d05]];
-
-  TimeSet tmsucc2 = Succ(M(1)*D(1),2, CtSem445 ); 
-  Set Sem445.2 = Dates(tmsucc2,y2007,y2009);
-  Real ok.2.1 = Belong(y2008m01d12,tmsucc2);
-  Real ok.2.2 = y2008m01d12 <: Sem445.2;
- //Error, no date for 2008. It should contain y2008m01d12
-  Real ok.2.3 = Dates(tmsucc2 *Y (2008), y2008,y2008m2) == [[y2008m01d12]];
-  
-  TimeSet tmsucc3 = Succ(M(1)*D(1),3, CtSem445 );
- //Works Ok,  tmsucc1 *Y (2008) = y2008m01d19
-  Set Sem445.3 = Dates(tmsucc3,y2007,y2009);
-  Real ok.3.1 = Belong(y2008m01d19,tmsucc3);
-  Real ok.3.2 = y2008m01d19 <: Sem445.3;
-  Real ok.3.3 = Dates(tmsucc3 *Y (2008), y2008,y2008m2) == [[y2008m01d19]];
  //Works Ok
   
-  Set ok = [[
-    ok.1.1,ok.1.2,ok.1.3,
-    ok.2.1,ok.2.2,ok.2.3,
-    ok.3.1,ok.3.2,ok.3.3
-  ]];
+
   Real numErr1 = Copy(NError);
 
@@ -52 +30 @@
   [[
     numErr0, numErr1
-  ]] << ok;
+  ]];
 
 //This is a messure of the success of the test 
-  Real quality_ = And(numErr1 == numErr0,BinGroup("And",ok));
+  Real quality_ = And(numErr1 == numErr0);
 
 //Return the results