Changeset 271d71c in tol

Timestamp:

Mar 20, 2012, 5:57:33 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

bb29eda

Parents:

83cb210

Message:

Fixes #1488

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

Location:

tol/btol/timeset_type

Files:

• tms.cpp (modified) (1 diff)
• tmsgrav.cpp (modified) (18 diffs)

tol/btol/timeset_type/tms.cpp

@@ -279 +279 @@
       if(!S)
       {
-      //Std(BText("\nTRACE GetHashBetween type=")+typeid(*this).name()+"\n");
-        if(typeid(*this).name()=="class BTmsRangeSuc")
-          printf("");
         NCThis->CalcHashBetween(hash, first, last);
         NCThis->PutCache(hash, bc, ec);

tol/btol/timeset_type/tmsgrav.cpp

@@ -695 +695 @@
   int iter, n, N = (int)MaxIter().Value(), M = (int)OutOfRange().Value();
   BDate curLimit = CurrentCalcLastDate();
-  if(curLimit.IsTheEnd() || !curLimit.HasValue()) 
-  { curLimit = BDate::DefaultLast(); }
+  if(!curLimit.HasValue()) { curLimit = BDate::DefaultLast(); }
   double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
   BDate cutLimit = curLimit+((1+defaultRange)*cutRangeFactor_.Value());
@@ -702 +701 @@
   {
     dte = EnsureNotAbortedSuccessor(dte);
-    EnsureLimitsSuccessor(dte);
+    if(dte.IsUnknown()||dte.IsTheEnd()) { return(dte); }
+    if(dte>=Sup()) { return(BDate::End()); }
+
     if(curLimit<dte) 
     { 
@@ -746 +747 @@
   int iter, n, N = (int)MaxIter().Value(), M = (int)OutOfRange().Value();
   BDate curLimit = CurrentCalcFirstDate();
-  if(curLimit.IsTheBegin() || !curLimit.HasValue()) 
-  { curLimit = BDate::DefaultFirst(); }
+  if(curLimit==BDate::Begin()) { curLimit = BDate::DefaultFirst(); }
   double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
   BDate cutLimit = curLimit-((1+defaultRange)*cutRangeFactor_.Value());
-  BDate old = dte;
   for(n=iter=0; iter<N; iter++)
   {
     dte = EnsureNotAbortedPredecessor(dte);
-    EnsureLimitsPredecessor(dte);
+    if(dte.IsUnknown()||dte.IsTheBegin()) { return(dte); }
+    if(dte<=Inf()) { return(BDate::Begin()); }
     if(curLimit>dte) 
     { 
@@ -778 +778 @@
     else if( ac &&  bc)    { BDate d = Maximum(aPred,bPred); AbortSaveInfo(dte_, d, -1); return(d); } 
     else                   { dte =  Minimum(aPred,bPred);  }
-    if(dte==old)
-    {
-      return(BDate::Begin());
-    }
-    old = dte;
   }
   AbortMessageMaxIter("BTmsIntersection::Predecessor",dte_,dte,-1);
@@ -852 +847 @@
   int iter, n, N = (int)MaxIter().Value(), M = (int)OutOfRange().Value();
   BDate curLimit = CurrentCalcLastDate();
-  if(curLimit.IsTheEnd() || !curLimit.HasValue()) 
-  { curLimit = BDate::DefaultLast(); }
+  if(!curLimit.HasValue()) { curLimit = BDate::DefaultLast(); }
   double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
   BDate cutLimit = curLimit+((1+defaultRange)*cutRangeFactor_.Value());
@@ -861 +855 @@
     {
       dte = EnsureNotAbortedSuccessor(dte);
-      EnsureLimitsSuccessor(dte);
+      if(dte.IsUnknown()||dte.IsTheEnd()) { return(dte); }
+      if(dte>=Sup()) { return(BDate::End()); }
       if(curLimit<dte) 
       { 
@@ -906 +901 @@
   int iter, n, N = (int)MaxIter().Value(), M = (int)OutOfRange().Value();
   BDate curLimit = CurrentCalcFirstDate();
-  if(curLimit.IsTheBegin() || !curLimit.HasValue()) 
-  { curLimit = BDate::DefaultFirst(); }
+  if(curLimit==BDate::Begin()) { curLimit = BDate::DefaultFirst(); }
   double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
   BDate cutLimit = curLimit-((1+defaultRange)*cutRangeFactor_.Value());
@@ -915 +909 @@
     {
       dte = EnsureNotAbortedPredecessor(dte);
-      EnsureLimitsPredecessor(dte);
+      if(dte.IsUnknown()||dte.IsTheBegin()) { return(dte); }
+      if(dte<=Inf()) { return(BDate::Begin()); }
       if(curLimit>dte) 
       { 
@@ -971 +966 @@
 {
   BDate d, inf;
-  for(BInt n=1; (!inf.IsTheBegin()) && (n<=NumArgs()); n++)
+  for(BInt n=1; (inf!=BDate::Begin()) && (n<=NumArgs()); n++)
   {
     d = Tms(Arg(n))->Inf();
@@ -984 +979 @@
 {
   BDate d, sup;
-  for(BInt n=1; (!sup.IsTheEnd()) && (n<=NumArgs()); n++)
+  for(BInt n=1; (sup!=BDate::End()) && (n<=NumArgs()); n++)
   {
     d = Tms(Arg(n))->Sup();
@@ -1195 +1190 @@
   BArray<BDate> D(NumArgs());
   BDate curLimit = CurrentCalcLastDate();
-  if(curLimit.IsTheEnd() || !curLimit.HasValue()) 
-  { curLimit = BDate::DefaultLast(); }
+  if(!curLimit.HasValue()) { curLimit = BDate::DefaultLast(); }
   double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
   BDate cutLimit = curLimit+((1+defaultRange)*cutRangeFactor_.Value());
@@ -1202 +1196 @@
   {
     dte = EnsureNotAbortedSuccessor(dte);
-    EnsureLimitsSuccessor(dte);
+    if(dte.IsUnknown()||dte.IsTheEnd()) { return(dte); }
+    if(dte>=Sup()) { return(BDate::End()); }
     if(curLimit<dte) 
     { 
@@ -1260 +1255 @@
   BArray<BDate> D(NumArgs());
   BDate curLimit = CurrentCalcFirstDate();
-  if(curLimit.IsTheBegin() || !curLimit.HasValue()) 
-  { curLimit = BDate::DefaultFirst(); }
+  if(curLimit==BDate::Begin()) { curLimit = BDate::DefaultFirst(); }
   double defaultRange =  BDate::DefaultLast() -  BDate::DefaultFirst();
   BDate cutLimit = curLimit+((1+defaultRange)*cutRangeFactor_.Value());
@@ -1267 +1261 @@
   {
     dte = EnsureNotAbortedPredecessor(dte);
-    EnsureLimitsPredecessor(dte);
+    if(dte.IsUnknown()||dte.IsTheBegin()) { return(dte); }
+    if(dte<=Inf()) { return(BDate::Begin()); }
     if(curLimit>dte) 
     { 
@@ -2106 +2101 @@
   BDate d, inf, cInf = center_->Inf(), uInf = units_->Inf();
   if(cInf.IsTheBegin()) { return(uInf); }
-  for(int k = from_; (!inf.IsTheBegin()) && (k<=until_); k++)
+  for(int k = from_; (inf!=BDate::Begin()) && (k<=until_); k++)
   {
     if(!k) { d = icu_->Inf(); }
@@ -2125 +2120 @@
   BDate d, sup, cSup = center_->Sup(), uSup = units_->Sup();
   if(cSup.IsTheEnd()) { return(uSup); }
-  for(int k = from_; (!sup.IsTheEnd()) && (k<=until_); k++)
+  for(int k = from_; (sup!=BDate::End()) && (k<=until_); k++)
   {
     if(!k) { d = icu_->Sup(); }
@@ -2512 +2507 @@
   int iter, n, N = (int)MaxIter().Value(), M = (int)OutOfRange().Value();
   BDate curLimit = CurrentCalcLastDate();
-  if(curLimit.IsTheEnd() || !curLimit.HasValue()) 
-  { curLimit = BDate::DefaultLast(); }
+  if(!curLimit.HasValue()) { curLimit = BDate::DefaultLast(); }
 //Std(Out()+"\nBTmsOfSerie::Successor of "+ser->Identify()+" "+dte);
   for(n=iter=0; iter<N; iter++)
   {
     dte = EnsureNotAbortedSuccessor(dte);
-    EnsureLimitsSuccessor(dte);
+    if(dte.IsUnknown()||dte.IsTheEnd()) { return(dte); }
+    if(dte>=Sup()) { return(BDate::End()); }
+
     if(curLimit<dte) 
     { 
@@ -2553 +2549 @@
   int iter, n, N = (int)MaxIter().Value(), M = (int)OutOfRange().Value();
   BDate curLimit = CurrentCalcFirstDate();
-  if(curLimit.IsTheBegin() || !curLimit.HasValue()) 
-  { curLimit = BDate::DefaultFirst(); }
+  if(curLimit==BDate::Begin()) { curLimit = BDate::DefaultFirst(); }
   for(n=iter=0; iter<N; iter++)
   {
     dte = EnsureNotAbortedPredecessor(dte);
-    EnsureLimitsPredecessor(dte);
+    if(dte.IsUnknown()||dte.IsTheBegin()) { return(dte); }
+    if(dte<=Inf()) { return(BDate::Begin()); }
     if(curLimit>dte) 
     {