Changeset a881dc8 in tol

Timestamp:

May 5, 2011, 7:58:17 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

2412c49

Parents:

8691a3d

Message:

Refs #1193

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

File:

• tol/btol/matrix_type/matgra.cpp (modified) (2 diffs)

tol/btol/matrix_type/matgra.cpp

@@ -3076 +3076 @@
 
 //--------------------------------------------------------------------
+bool Pol2Mat(const BPol& pol, int r, int c, BMat& contens_)
+//--------------------------------------------------------------------
+{
+  register int d;
+  register int i;
+  register int j;
+  register int m = pol.Size();
+  contens_.Alloc(r,c);
+  if(contens_.Rows()!=r) { return false; }
+  if(!r||!c) { return false; }
+  contens_.SetAllValuesTo(0);
+  register double* y0 = (double*)contens_.GetData().GetBuffer();
+  register double* y1 = (double*)contens_.GetData().GetBuffer()+(r*c);
+  register double* y;
+  struct BMon
+  { 
+    double coef;
+    int    degree;
+  };
+  assert(sizeof(BMon)==sizeof(BMonome<BDat>));
+  register BMon* p0 = (BMon*)pol.Buffer();
+  register BMon* p1 = (BMon*)pol.Buffer() + m;
+  register BMon* pk;
+  for(pk=p0; pk<p1; pk++)
+  {
+    d = pk->degree;
+    if(d>=0) { i= d; j=0; }
+    else     { j=-d; i=0; }
+    y = y0 + (i*c+j);
+    for(;(i<r)&&(j<c); i++, j++)
+    {
+      assert(y<y1);
+      if(y>=y1) 
+      {
+        Error(I2("Invalid access in","Acesso inválido en")+ " PolMat " +
+              " r="+r+
+              " c="+c+
+              " r*c="+(r*c)+
+              " m="+m+
+              " d="+d+
+              " i="+i+
+              " j="+d+
+              " i*c+j="+(i*c+j));
+        return false;
+      }
+      (*y)=pk->coef;
+      y += (c+1); 
+    }
+  }
+  return true;
+}
+//--------------------------------------------------------------------
 DeclareContensClass(BMat, BMatTemporary, BMatPolMat);
 DefExtOpr(1, BMatPolMat,   "PolMat", 3, 3, "Polyn Real Real",
@@ -3095 +3147 @@
 {
   BPol& pol = Pol(Arg(1));
-  register int d;
-  register int i;
-  register int j;
-  register int m = pol.Size();
   register int r = (BInt)Real(Arg(2));
   register int c = (BInt)Real(Arg(3));
-  contens_.Alloc(r,c);
-  if(contens_.Rows()!=r) { return; }
-  if(!r||!c) { return; }
-  contens_.SetAllValuesTo(0);
-  register double* y0 = (double*)contens_.GetData().GetBuffer();
-  register double* y1 = (double*)contens_.GetData().GetBuffer()+(r*c);
-  register double* y;
-  struct BMon
-  { 
-    double coef;
-    int    degree;
-  };
-  assert(sizeof(BMon)==sizeof(BMonome<BDat>));
-  register BMon* p0 = (BMon*)pol.Buffer();
-  register BMon* p1 = (BMon*)pol.Buffer() + m;
-  register BMon* pk;
-  for(pk=p0; pk<p1; pk++)
-  {
-    d = pk->degree;
-    if(d>=0) { i= d; j=0; }
-    else     { j=-d; i=0; }
-    y = y0 + (i*c+j);
-    for(;(i<r)&&(j<c); i++, j++)
-    {
-      assert(y<y1);
-      if(y>=y1) 
-      {
-        Error(I2("Invalid access in","Acesso inválido en")+ " PolMat " +
-              " r="+r+
-              " c="+c+
-              " r*c="+(r*c)+
-              " m="+m+
-              " d="+d+
-              " i="+i+
-              " j="+d+
-              " i*c+j="+(i*c+j));
-        return;
-      }
-      (*y)=pk->coef;
-      y += (c+1); 
-    }
-  }
+  Pol2Mat(pol,r,c,contens_);
 }
 /* */