Fix graph randomizer

64json · 64json · commit 1f06da72de65 · 2018-07-21T16:15:51.000+09:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [2.0.0]
 ### Added
 - Tracers for Java and C++.
 
diff --git a/languages/cpp/src/Randomize.h b/languages/cpp/src/Randomize.h
@@ -185,16 +185,13 @@ namespace Randomize {
             }
             Double ratioRandomizer;
             for (int i = 0; i < _N; i++) {
-                G[i][i] = 0;
-                T value = ratioRandomizer.create() < _ratio ? _weighted ? (*_randomizer).create() : 1 : 0;
-                if (_directed) {
-                    for (int j = 0; j < _N; j++) {
-                        if (i == j) continue;
-                        G[i][j] = value;
-                    }
-                } else {
-                    for (int j = 0; j < i; j++) {
-                        G[i][j] = G[j][i] = value;
+                for (int j = 0; j < _N; j++) {
+                    if (i == j) {
+                        G[i][j] = 0;
+                    } else if (_directed || i < j) {
+                        G[i][j] = ratioRandomizer.create() < _ratio ? _weighted ? (*_randomizer).create() : 1 : 0;
+                    } else {
+                        G[i][j] = G[j][i];
                     }
                 }
             }
diff --git a/languages/cpp/test/main.cpp b/languages/cpp/test/main.cpp
@@ -8,7 +8,7 @@ using namespace Randomize;
 
 int main() {
     int N = 5;
-    int **graph = Graph<int>(N, 1, *(new Integer(1, 5))).weighted(true).create();
+    int **graph = Graph<int>(N, .5, *(new Integer(1, 5))).weighted(true).directed(false).create();
     for (int i = 0; i < N; i++) {
         for (int j = 0; j < N; j++) {
             cout << graph[i][j] << " ";
diff --git a/languages/java/src/main/java/org/algorithm_visualizer/tracers/Randomize.java b/languages/java/src/main/java/org/algorithm_visualizer/tracers/Randomize.java
@@ -252,16 +252,13 @@ public Graph weighted() {
         public Object[][] create() {
             Object[][] G = (Object[][]) Array.newInstance(_randomizer.getType(), _N, _N);
             for (int i = 0; i < _N; i++) {
-                G[i][i] = 0;
-                Object value = random.nextDouble() < _ratio ? _weighted ? _randomizer.create() : 1 : 0;
-                if (_directed) {
-                    for (int j = 0; j < _N; j++) {
-                        if (i == j) continue;
-                        G[i][j] = value;
-                    }
-                } else {
-                    for (int j = 0; j < i; j++) {
-                        G[i][j] = G[j][i] = value;
+                for (int j = 0; j < _N; j++) {
+                    if (i == j) {
+                        G[i][j] = 0;
+                    } else if (_directed || i < j) {
+                        G[i][j] = random.nextDouble() < _ratio ? _weighted ? _randomizer.create() : 1 : 0;
+                    } else {
+                        G[i][j] = G[j][i];
                     }
                 }
             }
diff --git a/languages/js/src/Randomize.js b/languages/js/src/Randomize.js
@@ -104,18 +104,17 @@ class Graph extends Randomizer {
 
   create() {
     const G = new Array(this._N);
-    for (let i = 0; i < this._N; i++) G[i] = new Array(this._N);
     for (let i = 0; i < this._N; i++) {
-      G[i][i] = 0;
-      const value = Math.random() < this._ratio ? this._weighted ? this._randomizer.create() : 1 : 0;
-      if (this._directed) {
-        for (let j = 0; j < this._N; j++) {
-          if (i === j) continue;
-          G[i][j] = value;
-        }
-      } else {
-        for (let j = 0; j < i; j++) {
-          G[i][j] = G[j][i] = value;
+      G[i] = new Array(this._N);
+    }
+    for (let i = 0; i < this._N; i++) {
+      for (let j = 0; j < this._N; j++) {
+        if (i === j) {
+          G[i][j] = 0;
+        } else if (this._directed || i < j) {
+          G[i][j] = Math.random() < this._ratio ? this._weighted ? this._randomizer.create() : 1 : 0;
+        } else {
+          G[i][j] = G[j][i];
         }
       }
     }
diff --git a/specs/randomizers/index.js b/specs/randomizers/index.js
@@ -1,4 +1,5 @@
 export { default as Integer } from './Integer';
+export { default as Double } from './Double';
 export { default as String } from './String';
 export { default as Array2D } from './Array2D';
 export { default as Array1D } from './Array1D';

Original file line number	Diff line number	Diff line change
`@@ -185,16 +185,13 @@ namespace Randomize {`
`185`	`185`	`}`
`186`	`186`	`Double ratioRandomizer;`
`187`	`187`	`for (int i = 0; i < _N; i++) {`
`188`		`- G[i][i] = 0;`
`189`		`- T value = ratioRandomizer.create() < _ratio ? _weighted ? (*_randomizer).create() : 1 : 0;`
`190`		`- if (_directed) {`
`191`		`- for (int j = 0; j < _N; j++) {`
`192`		`- if (i == j) continue;`
`193`		`- G[i][j] = value;`
`194`		`- }`
`195`		`- } else {`
`196`		`- for (int j = 0; j < i; j++) {`
`197`		`- G[i][j] = G[j][i] = value;`
	`188`	`+ for (int j = 0; j < _N; j++) {`
	`189`	`+ if (i == j) {`
	`190`	`+ G[i][j] = 0;`
	`191`	`+ } else if (_directed \|\| i < j) {`
	`192`	`+ G[i][j] = ratioRandomizer.create() < _ratio ? _weighted ? (*_randomizer).create() : 1 : 0;`
	`193`	`+ } else {`
	`194`	`+ G[i][j] = G[j][i];`
`198`	`195`	`}`
`199`	`196`	`}`
`200`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`export { default as Integer } from './Integer';`
	`2`	`+export { default as Double } from './Double';`
`2`	`3`	`export { default as String } from './String';`
`3`	`4`	`export { default as Array2D } from './Array2D';`
`4`	`5`	`export { default as Array1D } from './Array1D';`