Changeset bbe047a in tol

Timestamp:

May 16, 2011, 10:06:22 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

806484d

Parents:

b0504e57

Message:

Refs #1205

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

Location:

tol/btol/timeset_type

Files:

• tmsgrav.cpp (modified) (15 diffs)
• tol_btmsgrav.h (modified) (1 diff)

tol/btol/timeset_type/tmsgrav.cpp

@@ -41 +41 @@
 //--------------------------------------------------------------------
 BTraceInit("tmsgrav.cpp");
-BDat  BTmsAbortable::maxIter_    = 100000;
-BDat  BTmsAbortable::outOfRange_ =  10000;
-
+BDat BTmsAbortable::maxIter_ = 100000;
+BDat BTmsAbortable::outOfRange_ = 10000;
+BDat BTmsAbortable::cutRangeFactor_ = 100;
 
 template<>
@@ -338 +338 @@
   if(!abortedMessageSended_)
   {
-    int N = (int)MaxIter().Value();
+    BText id = Identify();
+    if(id=="$tmp$") { id = ""; }
+    else { id = I2(" for TimeSet "," para el TimeSet ")+id; };
     Warning(function +
-            I2(" has been aborted after ",
-               " ha sido abortado después de ")+N+
-            I2(" iterations for TimeSet ",
-               " iteraciones para el TimeSet ")+Identify()+
+            I2(" has been aborted ",
+               " ha sido abortado ")+id+
             I2(" operating between dates "," operando entre las fechas [")+d1+","+d2+"]"+"\n"+
-            I2("Bounded TimeSet resulting behaviour will be assumed.",
-               "Se asumirá en los resultados el comportamiento de TimeSet acotado."));
+            I2("Probably this is an expression of empty time set.",
+               "Probablemente se trata de una expresión del conjunto temporal vacío."));
     ((BTmsAbortable*)(this))->abortedMessageSended_ = true;
   }
@@ -362 +362 @@
   {
     int M = (int)OutOfRange().Value();
+    BText id = Identify();
+    if(id=="$tmp$") { id = ""; }
+    else { id = I2(" for TimeSet "," para el TimeSet ")+id; };
     Warning(function +
             I2(" has been aborted because it has fall out of calculation range ",
-               " ha sido abortado porque se ha salido del rango de cálculo ")+
-          //" ["+CurrentCalcFirstDate()+ ","+CurrentCalcLastDate()+"] "+
-            M+
-            I2(" times ",
-               " veces ")+ 
-            I2(" for TimeSet ",
-               " para el TimeSet ")+Identify()+
+               " ha sido abortado porque se ha salido del rango de cálculo ")+id+
             I2(" operating between dates "," operando entre las fechas [")+d1+","+d2+"]"+"\n"+
-            I2("Bounded TimeSet resulting behaviour will be assumed.",
-               "Se asumirá en los resultados el comportamiento de TimeSet acotado."));
+            I2("Probably this is an expression of empty time set.",
+               "Probablemente se trata de una expresión del conjunto temporal vacío."));
     ((BTmsAbortable*)(this))->abortedMessageSended_ = true;
   }
@@ -699 +696 @@
   BDate curLimit = CurrentCalcLastDate();
   if(!curLimit.HasValue()) { curLimit = BDate::DefaultLast(); }
+  double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
+  BDate cutLimit = curLimit+((1+defaultRange)*cutRangeFactor_.Value());
   for(n=iter=0; iter<N; iter++)
   {
@@ -707 +706 @@
     if(curLimit<dte) 
     { 
-      if(n>M)
+      if((n>M) || (cutLimit<dte))
       {
         AbortMessageOutOfRange("BTmsIntersection::Successor",dte_,dte,1); 
@@ -749 +748 @@
   BDate curLimit = CurrentCalcFirstDate();
   if(curLimit==BDate::Begin()) { curLimit = BDate::DefaultFirst(); }
+  double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
+  BDate cutLimit = curLimit-((1+defaultRange)*cutRangeFactor_.Value());
   for(n=iter=0; iter<N; iter++)
   {
@@ -756 +757 @@
     if(curLimit>dte) 
     { 
-      if(n>M)
+      if((n>M) || (cutLimit>dte))
       {
         AbortMessageOutOfRange("BTmsIntersection::Predecessor",dte_,dte,-1); 
@@ -847 +848 @@
   BDate curLimit = CurrentCalcLastDate();
   if(!curLimit.HasValue()) { curLimit = BDate::DefaultLast(); }
+  double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
+  BDate cutLimit = curLimit+((1+defaultRange)*cutRangeFactor_.Value());
   if(a_!=b_)
   {
@@ -856 +859 @@
       if(curLimit<dte) 
       { 
-        if(n>M)
+        if((n>M) || (cutLimit<dte))
         {
           AbortMessageOutOfRange("BTmsDifference::Successor",dte_,dte,1); 
@@ -899 +902 @@
   BDate curLimit = CurrentCalcFirstDate();
   if(curLimit==BDate::Begin()) { curLimit = BDate::DefaultFirst(); }
+  double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
+  BDate cutLimit = curLimit-((1+defaultRange)*cutRangeFactor_.Value());
   if(a_!=b_)
   {
@@ -908 +913 @@
       if(curLimit>dte) 
       { 
-        if(n>M)
+        if((n>M) || (cutLimit>dte))
         {
           AbortMessageOutOfRange("BTmsDifference::Predecessor",dte_,dte,-1); 
@@ -1186 +1191 @@
   BDate curLimit = CurrentCalcLastDate();
   if(!curLimit.HasValue()) { curLimit = BDate::DefaultLast(); }
+  double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
+  BDate cutLimit = curLimit+((1+defaultRange)*cutRangeFactor_.Value());
   for(n=iter=0; iter<N; iter++)
   {
@@ -1193 +1200 @@
     if(curLimit<dte) 
     { 
-      if(n>M)
+      if((n>M)||(cutLimit<dte))
       {
         AbortMessageOutOfRange("BTmsAllIntersection::Successor",dte_,dte,1); 
@@ -1249 +1256 @@
   BDate curLimit = CurrentCalcFirstDate();
   if(curLimit==BDate::Begin()) { curLimit = BDate::DefaultFirst(); }
+  double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
+  BDate cutLimit = curLimit+((1+defaultRange)*cutRangeFactor_.Value());
   for(n=iter=0; iter<N; iter++)
   {
@@ -1256 +1265 @@
     if(curLimit>dte) 
     { 
-      if(n>M)
+      if((n>M)||(cutLimit>dte))
       {
         AbortMessageOutOfRange("BTmsAllIntersection::Predecessor",dte_,dte,-1); 

tol/btol/timeset_type/tol_btmsgrav.h

@@ -197 +197 @@
   static BDat  maxIter_;
   static BDat  outOfRange_;
+  static BDat  cutRangeFactor_;
   bool  abortedMessageSended_;
   BDate abortSuccFirst_;