Changeset 41d79a3 in tol

Timestamp:

Jun 17, 2011, 6:24:55 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f5c1a77

Parents:

ad4a32d

Message:

Refs #1262

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

Location:

tol/btol

Files:

• serie_type/tsrgrav.cpp (modified) (3 diffs)
• timeset_type/tms.cpp (modified) (1 diff)

tol/btol/serie_type/tsrgrav.cpp

@@ -955 +955 @@
     else if(dating!=right)
     {
-      if(!dating->IsCompatibleWith(*right))
+      if(!dating->IsCompatibleWith(*right,FirstDate(),LastDate()))
       {
         dating = NULL;
@@ -963 +963 @@
     {
       BText no_dating = "NO_DATING";
-      BText lName = left ?left ->Identify():no_dating;
-      BText rName = right?right->Identify():no_dating;
+      BText lName = left ?left ->Identify():no_dating+";";
+      BText rName = right?right->Identify():no_dating+";";
+      if(!left->Inf().HasValue() || !right->Sup().HasValue())
+      {
+        lName += BText(" //Expression is finite or has been truncated to interval [")<<left->Inf().Name()+","+left->Sup().Name()+"]";
+      }
+      if(!right->Inf().HasValue() || !right->Sup().HasValue())
+      {
+        rName += BText(" //Expression is finite or has been truncated to interval [")<<right->Inf().Name()+","+right->Sup().Name()+"]";
+      }
       Error(I2("Cannot concat series with incompatible dating or without "
          "dating.",
@@ -970 +978 @@
          "o sin fechado.")+
       "\nSeries:\n" +
-      LeftSer ()->Identify() + " -> "+lName+";\n"+
-      RightSer()->Identify() + " -> "+rName+";\n");
+      LeftSer ()->Identify() + " -> "+lName+"\n"+
+      RightSer()->Identify() + " -> "+rName+"\n");
     }
     PutDating(dating);

tol/btol/timeset_type/tms.cpp

@@ -525 +525 @@
   if(!first.HasValue()) { first = BDate::DefaultFirst(); }
   if(!last .HasValue()) { last  = BDate::DefaultLast (); }
-  BDate d1  = FirstNoGreat(first);
+  BDate d1 = FirstNoGreat(first);
   BDate d2 = tms.FirstNoGreat(first);
+  if(d1!=d2) { return(BFALSE); }
   while(d1<=last)
   {