Changeset a72f642 in tol

Timestamp:

May 16, 2012, 8:14:31 AM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

9524825

Parents:

d7349ff

Message:

Fixes #1523 in 3.2
Refs #1470 in 3.2
Sometimes the trial evaluation of non finite time series can return an invalid object with no dating that must be skipped.

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

File:

• tol/OIS/oisloader.cpp (modified) (1 diff)

tol/OIS/oisloader.cpp

@@ -1407 +1407 @@
           { result = x; }
           BUserTimeSerie* ser = (BUserTimeSerie*)result;
-          if(dating!=ser->Dating())
-          {
-            if(forceStoredTimeSet_!=0)
+          BTimeSet* serDating = ser->Dating();  
+          if(dating!=serDating)
+          {
+            if(!serDating || (forceStoredTimeSet_!=0))
             {
               ser->PutDating(dating);
             }
-            if(!dating->IsCompatibleWith(*(ser->Dating()),beginCache,endCache))
+            if(serDating && !dating->IsCompatibleWith(*serDating,beginCache,endCache))
             {
               Warning(BText("Dating of loaded Serie ")+name+"="+expr+