Changeset 681fb68 in tol

Timestamp:

Feb 9, 2010, 10:29:16 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

5e3cfca

Parents:

9e75438

Message:

Fixed #786

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

File:

• tol/btol/bmodel/modcalc.cpp (modified) (10 diffs)

tol/btol/bmodel/modcalc.cpp

@@ -162 +162 @@
 //--------------------------------------------------------------------
 BBool ApplyPolB(BArray<BDat>& ps, const BArray<BDat>& s,
-                const BPol& p_, BInt deg, const BText& name)
+                const BPol& p_, BInt deg, const BText& name, int maxTransferDegree)
 //--------------------------------------------------------------------
 {
@@ -178 +178 @@
     }
 //  Std(BText("  ps[")+j+"]="+ps[j].Name()+"\n");
-    if(ps(j).IsUnknown() && ok)
+    if(ok && (j>=maxTransferDegree) && ps(j).IsUnknown())
     {
       Error(name+ I2(" has unknown data at ",
@@ -191 +191 @@
 //--------------------------------------------------------------------
 static BBool ApplyPolB(BMat& ps, int rPs, const BMat& s, int rS,
-                       const BPol& p_, BInt deg, const BText& name)
+                       const BPol& p_, BInt deg, const BText& name, int maxTransferDegree)
 //--------------------------------------------------------------------
 {
@@ -207 +207 @@
     }
 //  Std(BText("  ps[")+j+"]="+ps[j].Name()+"\n");
-    if(ps(rPs,j).IsUnknown() && ok)
+    if(ok && (j>=maxTransferDegree) && ps(rPs,j).IsUnknown())
     {
       Error(name+ I2(" has unknown data at ",
@@ -220 +220 @@
 //--------------------------------------------------------------------
 BBool ApplyPolB(BMat& ps, int row, const BData& s,
-                const BPol& p_, BInt deg, const BText& name)
+                const BPol& p_, BInt deg, const BText& name, int maxTransferDegree)
 //--------------------------------------------------------------------
 {
@@ -236 +236 @@
     }
 //  Std(BText("  ps[")+j+"]="+ps[j].Name()+"\n");
-    if(ps(row,j).IsUnknown() && ok)
+    if(ok && (j>=maxTransferDegree) && ps(row,j).IsUnknown())
     {
       Error(name+ I2(" has unknown data at ",
@@ -350 +350 @@
       N_ = outData_.NumDates()-difDeg_;
       outDifData_.Alloc(1, N_);
-      ApplyPolB(outDifData_, 0, fullData_, dif_, difDeg_, outName_+"_Full");
+      ApplyPolB(outDifData_, 0, fullData_, dif_, difDeg_, outName_+"_Full", 0);
       Z_ = outDifData_.T();
       initialError_ = Sqrt(CenterMoment(outDifData_.Data(),2));
@@ -418 +418 @@
                    n+=transfer_(i).Size();
                    if(!ApplyPolB(inDifData_,i,inData_.Data(),i,dif_,
-                          difDeg_,inpName_(i)))
+                          difDeg_,inpName_(i),maxTransferDegree_))
                    { ok = BFALSE; }
                  }
@@ -806 +806 @@
 //    { Std(nli.Date(j).Name()+"\t"+nli.Data()[0][j].Name()+"\n"); }
 
-      if(ApplyPolB(inDifNonLin_, nli.Data().Data(), dif_, difDeg_, name))
+      if(ApplyPolB(inDifNonLin_, nli.Data().Data(), dif_, difDeg_, name, 0))
       { for(j=0; j<size; j++) { inputDifFilter_(j)+=inDifNonLin_(j); } }
       else
@@ -1250 +1250 @@
   BInt j;
 
-  ApplyPolB(outDifData_, 0, fullData_, dif_, difDeg_, outName_+"_Full");
+  ApplyPolB(outDifData_, 0, fullData_, dif_, difDeg_, outName_+"_Full", 0);
   Z_ = outDifData_.T();
   if(inputParam_)