Changeset a6be476 in tol

Timestamp:

Mar 25, 2013, 5:17:33 PM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

98778a7

Parents:

54000af

Message:

Refs #1643

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

Location:

tol/btol/timeset_type

Files:

• tms.cpp (modified) (1 diff)
• tmsgrav.cpp (modified) (7 diffs)
• tol_btmset.h (modified) (1 diff)
• tol_btmsgrav.h (modified) (3 diffs)

tol/btol/timeset_type/tms.cpp

@@ -857 +857 @@
 
 #define CheckTestAborted(t0,maxTimeSim,interval) \
-if(AbortedMessageSended()) \
+if(AbortMessageSent(-1)) \
 { \
-  return(TestAborted("0001",msg=BText("aborted ")+maxTimeSim+" seconds.",interval)); \
+  return(TestAborted("0001",msg=BText(" predecessor aborted ")+maxTimeSim+" seconds.",interval)); \
 } \
-else if(time(0)-t0>maxTimeSim) \
+if(AbortMessageSent(+1)) \
+{ \
+  return(TestAborted("0001",msg=BText(" successor aborted ")+maxTimeSim+" seconds.",interval)); \
+} \
+if(time(0)-t0>maxTimeSim) \
 { \
   return(TestAborted("0002",msg=BText("exceeded maximum simulation time of ")+maxTimeSim+" seconds.",interval)); \

tol/btol/timeset_type/tmsgrav.cpp

@@ -249 +249 @@
 //--------------------------------------------------------------------
 {
-  if(abortedMessageSended_) 
+  if(abortSuccMessageSent_) 
   { 
   //Std(BText("\nabortSucc[")+abortSuccFirst_+","+abortSuccLast_+"]");
@@ -273 +273 @@
 //--------------------------------------------------------------------
 {
-  if(abortedMessageSended_) 
+  if(abortPredMessageSent_) 
   { 
   //Std(BText("\nabortPred[")+abortPredFirst_+","+abortPredLast_+"]");
@@ -299 +299 @@
 //--------------------------------------------------------------------
 {
-  if(!abortedMessageSended_) { return; }
+  if(!AbortMessageSent(sign)) { return; }
   BTmsAbortable* T = (BTmsAbortable*)this;
   if(sign<0)
   {
-    if(abortPredFirst_.IsUnknown() || abortPredLast_.IsUnknown())
-    {
-      T->abortPredFirst_  = d2;
+    if(abortPredLast_.IsUnknown())
+    {
       T->abortPredLast_   = d1;
     }
-    else 
-    {
-      if(abortPredLast_ <d1) { T->abortPredLast_  = d1; }
-    //if(abortPredFirst_>d2) { T->abortPredFirst_ = d2; }
+    else if(abortPredLast_ <d1) 
+    { 
+      T->abortPredLast_  = d1; 
     }
   }
   else
   {
-    if( abortSuccFirst_.IsUnknown() || abortSuccLast_.IsUnknown() )
+    if(abortSuccFirst_.IsUnknown())
     {
       T->abortSuccFirst_  = d1;
-      T->abortSuccLast_   = d2;
-    }
-    else 
-    {
-      if(abortSuccFirst_>d1) { T->abortSuccFirst_ = d1; }
-    //if(abortSuccLast_< d2) { T->abortSuccLast_  = d2; }
+    }
+    else if(abortSuccFirst_>d1) 
+    {
+      T->abortSuccFirst_ = d1;
     }
   }
@@ -336 +332 @@
 //--------------------------------------------------------------------
 {
-  if(!abortedMessageSended_)
+  if(!AbortMessageSent(sign))
   {
     BText id = Identify();
@@ -344 +340 @@
             I2(" has been aborted ",
                " ha sido abortado ")+id+
-            I2(" operating between dates "," operando entre las fechas [")+d1+","+d2+"]"+"\n"+
-            I2("Probably this is an expression of empty or bounded time set.",
-               "Probablemente se trata de una expresión de conjunto temporal vacío o acotado."));
-    ((BTmsAbortable*)(this))->abortedMessageSended_ = true;
+            I2(" running "," ejecutando operaciones de tipo ")+
+            ((sign>0)?I2("successor","sucesor"):I2("predecessor","predecesor"))+
+            I2("-like operator between dates "," ejecutando entre las fechas [")+
+            d1+","+d2+"]"+"\n"+
+            I2("Probably this is an expression of empty time set, or out of valid time range.",
+               "Probablemente se trata de una expresión del conjunto temporal vacío o "
+               "acotado, o está fuera del rango temporal admitido."));
+    if(sign>0)
+    {
+      ((BTmsAbortable*)(this))->abortSuccMessageSent_ = true;
+    }
+    else
+    {
+      ((BTmsAbortable*)(this))->abortPredMessageSent_ = true;
+    }
   }
   AbortSaveInfo(d1,d2, sign);
@@ -359 +366 @@
 //--------------------------------------------------------------------
 {
-  if(!abortedMessageSended_)
+  if(!AbortMessageSent(sign))
   {
     int M = (int)OutOfRange().Value();
@@ -368 +375 @@
             I2(" has been aborted because it has fall out of calculation range ",
                " 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("Probably this is an expression of empty time set.",
-               "Probablemente se trata de una expresión del conjunto temporal vacío o acotado."));
-    ((BTmsAbortable*)(this))->abortedMessageSended_ = true;
+            I2(" running "," ejecutando operaciones de tipo ")+
+            ((sign>0)?I2("successor","sucesor"):I2("predecessor","predecesor"))+
+            I2("-like operator between dates "," ejecutando entre las fechas [")+
+            d1+","+d2+"]"+"\n"+
+            I2("Probably this is an expression of empty time set, or out of valid time range.",
+               "Probablemente se trata de una expresión del conjunto temporal vacío o "
+               "acotado, o está fuera del rango temporal admitido."));
+    if(sign>0)
+    {
+      ((BTmsAbortable*)(this))->abortSuccMessageSent_ = true;
+    }
+    else
+    {
+      ((BTmsAbortable*)(this))->abortPredMessageSent_ = true;
+    }
   }
   AbortSaveInfo(d1,d2,sign);

tol/btol/timeset_type/tol_btmset.h

@@ -119 +119 @@
                                    const BText& msg, 
                                    const BText& interval);
-  virtual bool AbortedMessageSended() const { return(false); }
+  virtual bool AbortMessageSent(bool sign) { return(false); }
 
   BBool IsCompatibleWith   (const BTimeSet& tms,

tol/btol/timeset_type/tol_btmsgrav.h

@@ -198 +198 @@
   static BDat  outOfRange_;
   static BDat  cutRangeFactor_;
-  bool  abortedMessageSended_;
+  bool  abortSuccMessageSent_;
+  bool  abortPredMessageSent_;
   BDate abortSuccFirst_;
   BDate abortSuccLast_;
@@ -206 +207 @@
   BTmsAbortable(BList* arg=NULL) 
   : BTmsCached(arg),
-    abortedMessageSended_(false),
+    abortSuccMessageSent_(false),
+    abortPredMessageSent_(false),
     abortSuccFirst_(BDate::Unknown()),
     abortSuccLast_ (BDate::Unknown()),
@@ -217 +219 @@
   static BDat GetOutOfRange() { return(outOfRange_); }
   static BDat GetCutRangeFactor() { return(cutRangeFactor_); }
-  bool AbortedMessageSended() const { return(abortedMessageSended_); }
+  bool AbortSuccMessageSent() const { return(abortSuccMessageSent_); }
+  bool AbortPredMessageSent() const { return(abortPredMessageSent_); }
+  bool AbortMessageSent(short sign) const
+  {
+    bool sent = (abortSuccMessageSent_ && (sign>0)) ||
+                (abortPredMessageSent_ && (sign<0));
+    return(sent);
+  }
 
 protected: