Changeset 302 for trunk/src

Timestamp:

Mar 9, 2006, 1:12:05 PM (19 years ago)

Author:

cxsong

Message:

updated using RpSerializable?

Location:

trunk/src/mesh

Files:

• grid2d.cc (modified) (1 diff)
• test_grid1d.cc (modified) (2 diffs)

trunk/src/mesh/grid2d.cc

@@ -81 +81 @@
 
         // total length = tagEncode + tagCompress + num + data
-        char * buf = (char*) malloc(numVals*sizeof(DataValType) + sizeof(int) + 2);
+        char * buf = (char*) new char[numVals*sizeof(DataValType) + sizeof(int) + 2];
         if (buf == NULL) {
                 RpAppendErr("RpGrid2d::serialize: malloc failed");

trunk/src/mesh/test_grid1d.cc

@@ -1 +1 @@
 #include <stdio.h>
+#include "serializer.h"
 #include "grid1d.h"
 
@@ -27 +28 @@
 };
 
+void writeToFile(char* buf, int len, const char* filename)
+{
+        if (buf != NULL) {
+                FILE* fp = fopen(filename, "w");
+                fwrite(buf, 1, len, fp);
+                fclose(fp);
+        }
+}
+
 int main()
 {
-        int i, j, err;
+        int i, j, err, nbytes;
 
         printf("Testing RpGrid1d\n");
 
-        printf("Testing constructor\n");
-        RpGrid1d grid1("output.grid(g1d)", 20);
+        RpGrid1d* grid1 = new RpGrid1d("output.grid(g1d)", 20);
+        grid1->addAllPoints(&(points[0]), 20);
 
-        printf("vector size: %d\n", grid1.size());
-        printf("capacity: %d\n", grid1.capacity());
+        char* buf = grid1->serialize(nbytes);
+        writeToFile(buf, nbytes, "out.grid1");
 
-        printf("Testing addAllPoints\n");
-        grid1.addAllPoints(&(points[0]), 20);
+        delete [] buf; 
+        //buf = NULL;
 
-        printf("vector size: %d\n", grid1.size());
+        printf("Testing serializer\n");
 
-        printf("Testing print\n");
-        grid1.print();
+        RpSerializer myvis;
 
-        printf("Testing serialize\n");
+        myvis.addObject(grid1);
 
-        int nbytes;
-        char* buf = grid1.serialize(nbytes);
-        printf("nbytes=%d\n", nbytes);
+        RpGrid1d* ptr = (RpGrid1d*) myvis.getObject(grid1->objectName());
 
-        FILE* fp = fopen("out.grid", "w");
-        fwrite(buf, 1, nbytes, fp);
-        fclose(fp);
+        if (ptr == NULL)
+                printf("%s not found\n", grid1->objectName());
 
-        printf("Testing print\n");
-        grid1.print();
+        myvis.print();
 
-        printf("Testing deserialize\n");
+        buf = myvis.serialize();
 
-        RpGrid1d * grid2 = new RpGrid1d("test.path");
-        grid2->deserialize(buf);
-
-        printf("Testing getData\n");
-        
-//      double* ptr = grid2->getDataCopy();
-        double* ptr = grid2->getData();
-        for (i=0; i<grid2->size(); i++) {
-                printf("%.12f\n", ptr[i]);
-        }
-
+        nbytes = myvis.numBytes();
+        writeToFile(buf, nbytes, "out.g1");