Changeset dca551f in tol

Timestamp:

Sep 26, 2012, 2:06:42 PM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f3405af

Parents:

e8d85c2

Message:

Refs #1136
Fixed bug in CalcResidualsJacobian

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

File:

• tol/bmath/bstat/arma.cpp (modified) (3 diffs)

tol/bmath/bstat/arma.cpp

@@ -1238 +1238 @@
     for(i=1;i<ar.Size();i++)
     {
-      coef_[r++] = ar[i].Coef();
+      coef_[r++] = -ar[i].Coef();
     }
     for(j=1;j<ma.Size();j++)
     {
-      coef_[r++] = ma[j].Coef();
+      coef_[r++] = -ma[j].Coef();
     }
   }
@@ -1260 +1260 @@
     for(i=1;i<ar.Size();i++)
     {
-      ar[i].PutCoef(coef[r++]);
+      ar[i].PutCoef(-coef[r++]);
     }
     for(j=1;j<ma.Size();j++)
     {
-      ma[j].PutCoef(coef[r++]);
+      ma[j].PutCoef(-coef[r++]);
     }
   }
@@ -1320 +1320 @@
     {
       d = ar[i].Degree();
-      for(j=0; j<m_; j++) { J(j,k) = (j<d)?0:a_(j-d,0); } 
-      k++;
+      for(j=0; j<m_; j++) 
+      { 
+        J(j,r) = (j<d)?0:-a_(j-d,0); 
+      } 
+      r++;
     } 
     MatBackwardDifEq(BPol::One()/ma,a_,b);
-    for(j=1;j<ma.Size();j++)
+    for(i=1;i<ma.Size();i++)
     {
       d = ma[i].Degree();
-      for(j=0; j<m_; j++) { J(j,k) = (j<d)?0:-b(j-d,0); } 
-      k++;
-    }
-  }
+      for(j=0; j<m_; j++) 
+      {
+        J(j,r) = (j<d)?0:b(j-d,0); 
+      } 
+      r++;
+    }
+  }
+/*  
+  for(r=0;r<n_;r++)
+  {
+    for(j=0; j<m_; j++) 
+    {
+      if(J(j,r).IsUnknown())
+        printf("");
+    } 
+  }
+*/
 }