Add fill methods in C++ Array1D/Array2D/Graph Randomizers

64json · 64json · commit 1e96c29426b7 · 2018-12-03T02:54:21.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.0.6]
+### Added
+- Add fill methods in C++ Array1D/Array2D/Graph Randomizers.
+
+### Changed
+- Improve catching time limit exceeded.
+
 ## [2.0.5]
 ### Changed
 - Build tracers from skeletons.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@algorithm-visualizer/tracer-generator",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Visualization Libraries for Algorithm Visualizer",
   "scripts": {
     "build": "node ./node_modules/webpack/bin/webpack --bail --progress --config webpack.config.js && chmod +x ./bin/*"
diff --git a/src/languages/cpp/builder/skeleton/include/Randomize.h b/src/languages/cpp/builder/skeleton/include/Randomize.h
@@ -85,7 +85,7 @@ namespace Randomize {
 
 
     template<class T>
-    class Array2D : public Randomizer<T **> {
+    class Array2D : public Randomizer<void> {
     private:
         int _N;
         int _M;
@@ -105,22 +105,23 @@ namespace Randomize {
             return *this;
         }
 
-        T **create() {
-            T **D = new T *[_N];
+        void create() {
+            throw std::invalid_argument("Call 'void fill(T *D)' instead.");
+        }
+
+        void fill(T *D) {
             for (int i = 0; i < _N; i++) {
-                D[i] = new T[_M];
                 for (int j = 0; j < _M; j++) {
-                    D[i][j] = (*_randomizer).create();
+                    D[i * _M + j] = (*_randomizer).create();
                 }
-                if (_sorted) std::sort(D[i], D[i] + _M);
+                if (_sorted) std::sort(&D[i * _M], &D[i * _M] + _M);
             }
-            return D;
         }
     };
 
 
     template<class T>
-    class Array1D : public Randomizer<T *> {
+    class Array1D : public Randomizer<void> {
     private:
         int _N;
         Randomizer<T> *_randomizer;
@@ -138,20 +139,21 @@ namespace Randomize {
             return *this;
         }
 
-        // TODO: fix array1d/2d/graph randomizers returning pointer instead of array
-        T *create() {
-            T *D = new T[_N];
+        void create() {
+            throw std::invalid_argument("Call 'void fill(T *D)' instead.");
+        }
+
+        void fill(T *D) {
             for (int i = 0; i < _N; i++) {
                 D[i] = (*_randomizer).create();
             }
             if (_sorted) std::sort(D, D + _N);
-            return D;
         }
     };
 
 
     template<class T>
-    class Graph : public Randomizer<T **> {
+    class Graph : public Randomizer<void> {
     private:
         int _N;
         double _ratio;
@@ -178,24 +180,23 @@ namespace Randomize {
             return *this;
         }
 
-        T **create() {
-            T **G = new T *[_N];
-            for (int i = 0; i < _N; i++) {
-                G[i] = new T[_N];
-            }
+        void create() {
+            throw std::invalid_argument("Call 'void fill(T *G)' instead.");
+        }
+
+        void fill(T *G) {
             Double ratioRandomizer;
             for (int i = 0; i < _N; i++) {
                 for (int j = 0; j < _N; j++) {
                     if (i == j) {
-                        G[i][j] = 0;
+                        G[i * _N + j] = 0;
                     } else if (_directed || i < j) {
-                        G[i][j] = ratioRandomizer.create() < _ratio ? _weighted ? (*_randomizer).create() : 1 : 0;
+                        G[i * _N + j] = ratioRandomizer.create() < _ratio ? _weighted ? (*_randomizer).create() : 1 : 0;
                     } else {
-                        G[i][j] = G[j][i];
+                        G[i * _N + j] = G[j * _N + i];
                     }
                 }
             }
-            return G;
         }
     };
 }
diff --git a/src/languages/cpp/builder/skeleton/test/main.cpp b/src/languages/cpp/builder/skeleton/test/main.cpp
@@ -1,17 +1,22 @@
 #include <string>
 #include <iostream>
-#include "LogTracer.h"
 #include "GraphTracer.h"
 #include "Randomize.h"
 
+#define N 5
+
 using namespace std;
-using namespace Randomize;
 
 int main() {
-    int N = 5;
-    int **graph = Graph<int>(N, .5, *(new Integer(1, 5))).weighted(true).directed(false).create();
+    int array[N][N];
+    Randomize::Graph<int>(N, 1, *(new Randomize::Integer(1, 9))).weighted().directed(false).fill(&array[0][0]);
     GraphTracer graphTracer;
-    int arr[][2] = {{0, 1}, {1, 0}};
-    graphTracer.set(arr);
+    graphTracer.set(array);
+    for (int i = 0; i < N; i++) {
+        for (int j = 0; j < N; j++) {
+            cout << array[i][j] << " ";
+        }
+        cout << endl;
+    }
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@algorithm-visualizer/tracer-generator",`
`3`		`- "version": "2.0.5",`
	`3`	`+ "version": "2.0.6",`
`4`	`4`	`"description": "Visualization Libraries for Algorithm Visualizer",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "node ./node_modules/webpack/bin/webpack --bail --progress --config webpack.config.js && chmod +x ./bin/*"`