Changeset 5e88b2f in tol

Timestamp:

Mar 18, 2015, 11:57:16 AM (12 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

08c59de

Parents:

565b311

Message:

Refs #1826, #1812
Se modifica la lectura/escritura de polinomios (Polyn) en OIS.

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

Location:

tol/OIS

Files:

• oiscreator.cpp (modified) (1 diff)
• oisloader.cpp (modified) (1 diff)
• tol_ois.h (modified) (2 diffs)

tol/OIS/oiscreator.cpp

@@ -413 +413 @@
   int s = x.Size();
   EWrite(s, stream);
-  BCoefDeg* buf = (BCoefDeg*)AllocAuxilarBuffer(3,sizeof(BCoefDeg)*x.Size());
+  char* buf = (char*)AllocAuxilarBuffer(3,SIZEOF_BCoefDeg*x.Size());
   for(int i=0; i<x.Size(); i++)
   {
-    buf[i].degree_      = x(i).Degree();
-    buf[i].coefficient_ = x(i).Coef  ();
-  }
-  Ensure(Write(buf,sizeof(BCoefDeg),x.Size(),stream));
+    int *degree;
+    BDat *coefficient;
+    degree = (int*)&buf[i*SIZEOF_BCoefDeg];
+    coefficient = (BDat*)&buf[i*SIZEOF_BCoefDeg+sizeof(int)];
+    *degree = x(i).Degree();
+    *coefficient = x(i).Coef();
+  }
+  Ensure(Write(buf,SIZEOF_BCoefDeg,x.Size(),stream));
   return(true);
 };

tol/OIS/oisloader.cpp

@@ -409 +409 @@
     }
   }
-  else if(control_.typeSizes_.sizeof_BCoefDeg_==sizeof(BCoefDeg))
-  {
-    BCoefDeg* buf = (BCoefDeg*)AllocAuxilarBuffer(1,sizeof(BCoefDeg)*s);
-    Ensure(Read(buf,sizeof(BCoefDeg),s,stream));
+  else if(control_.typeSizes_.sizeof_BCoefDeg_==SIZEOF_BCoefDeg)
+  {
+    char* buf = (char*)AllocAuxilarBuffer(1,SIZEOF_BCoefDeg*s);
+    Ensure(Read(buf,SIZEOF_BCoefDeg,s,stream));
     for(i=0; i<x.Size(); i++)
     {
-      x[i].PutDegree(buf[i].degree_);
-      x[i].PutCoef  (buf[i].coefficient_);
+      int *degree;
+      BDat *coefficient;
+      degree = (int*)&buf[i*SIZEOF_BCoefDeg];
+      coefficient = (BDat*)&buf[i*SIZEOF_BCoefDeg+sizeof(int)];
+      x[i].PutDegree(*degree);
+      x[i].PutCoef(*coefficient);
     }
   }

tol/OIS/tol_ois.h

@@ -67 +67 @@
 #define Ensure(doit) if(!(doit)) { return(0); }
 
+// SIZEOF_BCoefDeg was sizeof(BCoefDeg) 
+#define SIZEOF_BCoefDeg (sizeof(int)+sizeof(BDat))
 
 //--------------------------------------------------------------------
@@ -195 +197 @@
         sizeof_double_     (sizeof(double)),
         sizeof_BDat_       (sizeof(BDat)),
-        sizeof_BCoefDeg_   (sizeof(BCoefDeg)),
+        sizeof_BCoefDeg_   (SIZEOF_BCoefDeg),
         sizeof_BGrammarId_ (sizeof(BGrammarId))
       {}