Changeset 468 for library/tests/square_mat_prep.cpp

Timestamp:

08/04/09 08:29:50 (15 years ago)

Author:

vbarta

Message:

added supplementary random test data to agenda

Files:

• library/tests/square_mat_prep.cpp (modified) (4 diffs)

library/tests/square_mat_prep.cpp

@@ -4 +4 @@
 #include "additive_generator.h"
 #include "size_generator.h"
+#include "square_mat_point.h"
 #include <iostream>
 #include <iomanip>
@@ -15 +16 @@
 UIREGISTER(size_generator);
 UIREGISTER(additive_generator);
+UIREGISTER(square_mat_point);
 
 const char *generator_file_name = "generator.cfg";
@@ -60 +62 @@
         cerr << "usage: " << argv[0] << " [ -g generator.cfg ] [ -a agenda_output.cfg ] [ -l agenda_length ]" << endl;
     } else {
-        Array<mat> mag(agenda_length);
+        Array<square_mat_point *> mag(agenda_length);
 
         UIFile gspec(generator_file_name);
         auto_ptr<generator> gen(UI::build<generator>(gspec, "generator"));
         for (int i = 0; i < agenda_length; ++i) {
-            mag(i) = gen->next();
+            mat m = gen->next();
+            square_mat_point *p = new square_mat_point();
+            p->set_parameters(m, randu(m.rows()), randu());
+            mag(i) = p;
         }
 
@@ -71 +76 @@
         UI::save(mag, fag, "agenda");
         fag.save(agenda_file_name);
+
+        for (int i = 0; i < agenda_length; ++i) {
+            square_mat_point *p = mag(i);
+            mag(i) = 0;
+            delete p;
+        }
     }
 }