Changeset cb991cf in tol

Timestamp:

Mar 15, 2012, 9:43:19 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

2c058e5

Parents:

a9c6a36

Message:

Fixes #1470 (trunk)
If Ois.ForceStoredTimeSet is true, then internally stored TimeSet's will be used even if a TimeSet with the same name is available.

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

Location:

tol/OIS

Files:

• ois.cpp (modified) (1 diff)
• oisapitol.cpp (modified) (1 diff)
• oisloader.cpp (modified) (11 diffs)
• tol_ois.h (modified) (1 diff)

tol/OIS/ois.cpp

@@ -65 +65 @@
 size_t BOis::_MaxBlockLength_    = 1024*1024;
 int    BOis::_NumAuxiliarBuffer_ = 9;
+
+BDat BOis::forceStoredTimeSet_ = 0;
 
 #ifdef TRACE_OIS_FILE

tol/OIS/oisapitol.cpp

@@ -216 +216 @@
   );
   OIS_def_BAE_->PutConstant();
+
+  BParamDat* ois_forceStoredTimeSet_= new BParamDat
+  (
+    "Ois.ForceStoredTimeSet",
+    forceStoredTimeSet_,
+    I2("If true then internally stored TimeSet's will be used even if a "
+       "TimeSet with the same name is available.",
+       "Si es cierto se usarán siempre los TimeSet alamcenados localmente "
+       "incluso si está accesible otro con el mismo nombre.")
+  );
 
   loadModeOptions_.AllocBuffer(3);

tol/OIS/oisloader.cpp

@@ -59 +59 @@
     if(obj->OisOffset() && (obj->OisOffset()!=offset_))
     {
-      ::Warning(I2("OIS Object already has assigned offset",
-                   "El objecto OIS ya tiene offset asignado")+
-                ": "+obj->Identify());
+      if(obj->Grammar()!=GraTimeSet() || forceStoredTimeSet_)
+      {
+        ::Warning(I2("OIS Object already has assigned offset",
+                     "El objecto OIS ya tiene offset asignado")+
+                  ": "+obj->Identify());
+      }
       return(obj);
     } 
@@ -1310 +1313 @@
           BUserTimeSerie* x = NULL;  
           List* tree = NULL;
+          BText expr = "";
+          BUserTimeSet* dating = NULL;
+          BDate first, last, beginCache, endCache;
           if(!offset)
           {
@@ -1320 +1326 @@
             object_->SetPos(offset);
             //CALL ReadNextObject
-            BUserTimeSet* dating = NULL;
             {
               BINT64 offset_tms = object_->Offset();
@@ -1328 +1333 @@
                 return(NullError("FATAL cannot built dating of serie")); 
               }
-              dating = (BUserTimeSet*)GraTimeSet()->FindOperand(r->Name(), false);
-              if(!dating) { dating = (BUserTimeSet*)r; }
-              else if(dating!=r)       
+              if(forceStoredTimeSet_!=0)
+              {
+                dating = (BUserTimeSet*)r;
+              } 
+              else
               { 
-                static BOffsetObject ofob_tms;
-                ofob_tms.PutOffset(offset_tms);
-                int found_tms = readed_.FindSorted(ofob_tms, CompareOffset);
-                readed_[found_tms].ReplaceObject(dating);
-                DESTROY(r);
-              }  
-            }
-            BDate first, last, beginCache, endCache;
+                dating = (BUserTimeSet*)GraTimeSet()->FindOperand(r->Name(), false);
+                if(!dating) { dating = (BUserTimeSet*)r; }
+                else if(dating!=r)       
+                { 
+                  static BOffsetObject ofob_tms;
+                  ofob_tms.PutOffset(offset_tms);
+                  int found_tms = readed_.FindSorted(ofob_tms, CompareOffset);
+                  readed_[found_tms].ReplaceObject(dating);
+                  DESTROY(r);
+                }  
+              }
+            }
             ERead(first, serie_);
             ERead(last,  serie_);
@@ -1358 +1369 @@
                        name+"' description='"+description+"')")); 
               }
+              expr = BParser::Unparse(tree,"  ","\n");
               bool oldEnabled = BOut::Disable();
+              BGrammar::IncLevel();
               x = (BUserTimeSerie*)GraSerie()->EvaluateTree(tree); 
+              BGrammar::DecLevel();
               if(oldEnabled) { BOut::Enable(); }
               if(x) 
@@ -1368 +1382 @@
               else 
               {
-                BText expr = BParser::Unparse(tree,"  ","\n");
                 expr = Compact(expr); 
                #ifndef NDEBUG
@@ -1393 +1406 @@
           else                
           { result = x; }
+          BUserTimeSerie* ser = (BUserTimeSerie*)result;
+          if(dating!=ser->Dating())
+          {
+            if(forceStoredTimeSet_!=0)
+            {
+              ser->PutDating(dating);
+            }
+            if(!dating->IsCompatibleWith(*(ser->Dating()),beginCache,endCache))
+            {
+              Warning(BText("Dating of loaded Serie ")+name+"="+expr+
+                            "is not compatible with original dating "+
+                            dating->Identify()+"="+dating->Expression()+" "+
+                            "between ["+beginCache+","+endCache+"]"); 
+            }  
+          }  
           if(tree) 
           {
@@ -1413 +1441 @@
           BHash h(s);
           Ensure(Read(h.GetBuffer(),sizeof(double),h.Size(),timeset_));
+          BUserTimeSet* x_old = (BUserTimeSet*)GraTimeSet()->FindOperand(name,true);
           BUserTimeSet* x = NULL;
           char loadTree;
           ERead(loadTree,timeset_);
           List* tree = NULL;
+          BText expr;
           if(loadTree)
           {
             tree = ReadTree(timeset_);
+            expr = Compact(BParser::Unparse(tree,"  ","\n"));
             if(!tree) 
             { 
@@ -1425 +1456 @@
                      name+"' description='"+description+"')")); 
             }
+          }
+          if(!forceStoredTimeSet_ && x_old)
+          {
+            x = x_old;
+          }
+          else if(tree)
+          {
             bool oldEnabled = BOut::Disable();
             BDat numErr0 = TOLErrorTryNumber();
+            BGrammar::IncLevel();
             x = (BUserTimeSet*)GraTimeSet()->EvaluateTree(tree); 
+            BGrammar::DecLevel();
             BDat numErr1 = TOLErrorTryNumber();
             if(numErr0<numErr1) { DESTROY(x); }
@@ -1442 +1482 @@
               }
             }
-            else 
-            {
-              x = (BUserTimeSet*)GraTimeSet()->FindOperand(name,true);
-              if(!x)
-              {
-                BText expr = Compact(BParser::Unparse(tree,"  ","\n"));
-                if(name.HasName()) { expr = name+" = "+expr; }
-                Warning(BText("Cannot rebuild virtual expression of non "
-                        "bounded TimeSet ")+expr+ "\nOnly cached "
-                        "dates will be accessible between ["+beginCache+","+
-                        endCache+"]\nTo avoid this problem save just "
-                        "bounded time sets or use expressions that could "
-                        "be evaluated at OIS loading time." );
-              }
+            else
+            {
+              if(name.HasName()) { expr = name+" = "+expr; }
+              Warning(BText("Cannot rebuild virtual expression of non "
+                      "bounded TimeSet ")+expr+ "\nOnly cached "
+                      "dates will be accessible between ["+beginCache+","+
+                      endCache+"]\nTo avoid this problem save just "
+                      "bounded time sets or use expressions that could "
+                      "be evaluated at OIS loading time." );
             } 
           }
@@ -1473 +1508 @@
           if(tree) 
           {
-            if(result && !result->GetOisTree()) { result->PutOisTree(tree); }
+            if(result && (x!=x_old) && !result->GetOisTree()) 
+            { 
+              result->PutOisTree(tree); 
+            }
             tree->Destroy(); 
           }

tol/OIS/tol_ois.h

@@ -565 +565 @@
   static bool isLittleEndian_;
 
+//Default for forcing stored TimeSet
+  static BDat forceStoredTimeSet_;
+
   static BStruct*  addressStr_;
   static BStruct*  docStr_;