Merge remote-tracking branch 'origin' into 2024-refactoring-RF2

veg · Jan 31, 2025 · bea6e0b · bea6e0b
2 parents f1bc9a7 + 388de89
commit bea6e0b
Show file tree

Hide file tree

Showing 28 changed files with 11 additions and 11 deletions.
diff --git a/html/network.html b/html/network.html
@@ -960,7 +960,7 @@ <h4 class="modal-title">Listing nodes in cluster X</h4>
 
       var initialize_cluster_network_graphs = function () {
         //Initialize clusternetworkgraph with json url
-        url = "/sample_data/workshop/DummyNetworkAttributes.json";
+        url = "/test/workshop/DummyNetworkAttributes.json";
 
         d3.json(url, function (error, results) {
           if (error) {

diff --git a/html/plain.html b/html/plain.html
@@ -895,8 +895,8 @@ <h4 class="modal-title">Listing nodes in cluster X</h4>
 
       var initialize_cluster_network_graphs = function () {
         //Initialize clusternetworkgraph with json url
-        url = "/sample_data/example/example.json";
-        //url = "sample_data/LA.json"
+        url = "/test/example/example.json";
+        //url = "test/LA.json"
 
         d3.json(url, function (error, results) {
           if (error) {

diff --git a/html/social.html b/html/social.html
@@ -928,8 +928,8 @@ <h4 class="modal-title">Listing nodes in cluster X</h4>
       var initialize_cluster_network_graphs = function () {
         //Initialize clusternetworkgraph with json url
         url =
-          "../sample_data/workshop/SocialDemoFiles/SocialNetwork.trace.json";
-        //url = "sample_data/LA.json"
+          "../test/workshop/SocialDemoFiles/SocialNetwork.trace.json";
+        //url = "test/LA.json"
 
         d3.json(url, function (error, results) {
           if (error) {
@@ -1099,10 +1099,10 @@ <h4 class="modal-title">Listing nodes in cluster X</h4>
         });
 
         d3.csv(
-          "../sample_data/workshop/SocialDemoFiles/SocialAttributes.csv",
+          "../test/workshop/SocialDemoFiles/SocialAttributes.csv",
           function (error, nodes) {
             d3.csv(
-              "../sample_data/workshop/SocialDemoFiles/SocialEdges.csv",
+              "../test/workshop/SocialDemoFiles/SocialEdges.csv",
               function (error, edges) {
                 _loaded_network_data["nodes"] = nodes;
                 _loaded_network_data["edges"] = edges;

diff --git a/index.html b/index.html
@@ -969,10 +969,10 @@ <h4 class="modal-title">Listing nodes in cluster X</h4>
 
       var initialize_cluster_network_graphs = function () {
         //Initialize clusternetworkgraph with json url
-        url = "sample_data/example/example.json";
-        //url = "sample_data/example/vl_recent_value_adj.json";
-        //url = "sample_data/example/example_with_random_countries.json" // For testing the mapping feature.
-        //url = "sample_data/LA.json"
+        url = "test/example/example.json";
+        //url = "test/example/vl_recent_value_adj.json";
+        //url = "test/example/example_with_random_countries.json" // For testing the mapping feature.
+        //url = "test/LA.json"
         //url = "private/new.json";
 
         d3.json(url, function (error, results) {

diff --git a/sample_data/SocialAttributes.csv → test/SocialAttributes.csv b/sample_data/SocialAttributes.csv → test/SocialAttributes.csv
diff --git a/sample_data/SocialEdges.csv → test/SocialEdges.csv b/sample_data/SocialEdges.csv → test/SocialEdges.csv
diff --git a/sample_data/SocialNetwork-fixed.trace.json → test/SocialNetwork-fixed.trace.json b/sample_data/SocialNetwork-fixed.trace.json → test/SocialNetwork-fixed.trace.json
diff --git a/sample_data/empty.json → test/empty.json b/sample_data/empty.json → test/empty.json
diff --git a/sample_data/example/example.json → test/example/example.json b/sample_data/example/example.json → test/example/example.json
diff --git a/..._data/example/example_with_countries.json → test/example/example_with_countries.json b/..._data/example/example_with_countries.json → test/example/example_with_countries.json
diff --git a/sample_data/example/vl_recent_value_adj.json → test/example/vl_recent_value_adj.json b/sample_data/example/vl_recent_value_adj.json → test/example/vl_recent_value_adj.json
diff --git a/sample_data/precomputed_subcluster.json → test/precomputed_subcluster.json b/sample_data/precomputed_subcluster.json → test/precomputed_subcluster.json
diff --git a/sample_data/sim/C/empty.json → test/sim/C/empty.json b/sample_data/sim/C/empty.json → test/sim/C/empty.json
diff --git a/sample_data/sim/C/phase1.json → test/sim/C/phase1.json b/sample_data/sim/C/phase1.json → test/sim/C/phase1.json
diff --git a/sample_data/sim/C/phase2.json → test/sim/C/phase2.json b/sample_data/sim/C/phase2.json → test/sim/C/phase2.json
diff --git a/sample_data/sim/phase_1.json → test/sim/phase_1.json b/sample_data/sim/phase_1.json → test/sim/phase_1.json
diff --git a/sample_data/sim/phase_2.json → test/sim/phase_2.json b/sample_data/sim/phase_2.json → test/sim/phase_2.json
diff --git a/sample_data/sim/phase_3.json → test/sim/phase_3.json b/sample_data/sim/phase_3.json → test/sim/phase_3.json
diff --git a/sample_data/sim/test.fas_1.csv → test/sim/test.fas_1.csv b/sample_data/sim/test.fas_1.csv → test/sim/test.fas_1.csv
diff --git a/sample_data/sim/test.fas_2.csv → test/sim/test.fas_2.csv b/sample_data/sim/test.fas_2.csv → test/sim/test.fas_2.csv
diff --git a/sample_data/sim/test.fas_3.csv → test/sim/test.fas_3.csv b/sample_data/sim/test.fas_3.csv → test/sim/test.fas_3.csv
diff --git a/sample_data/workshop/DummyNetwork.json → test/workshop/DummyNetwork.json b/sample_data/workshop/DummyNetwork.json → test/workshop/DummyNetwork.json
diff --git a/...data/workshop/DummyNetworkAttributes.json → test/workshop/DummyNetworkAttributes.json b/...data/workshop/DummyNetworkAttributes.json → test/workshop/DummyNetworkAttributes.json
diff --git a/...op/DummyNetworkAttributesPreComputed.json → ...op/DummyNetworkAttributesPreComputed.json b/...op/DummyNetworkAttributesPreComputed.json → ...op/DummyNetworkAttributesPreComputed.json
diff --git a/...shop/SocialDemoFiles/SocialAttributes.csv → ...shop/SocialDemoFiles/SocialAttributes.csv b/...shop/SocialDemoFiles/SocialAttributes.csv → ...shop/SocialDemoFiles/SocialAttributes.csv
diff --git a/.../workshop/SocialDemoFiles/SocialEdges.csv → .../workshop/SocialDemoFiles/SocialEdges.csv b/.../workshop/SocialDemoFiles/SocialEdges.csv → .../workshop/SocialDemoFiles/SocialEdges.csv
diff --git a/.../SocialDemoFiles/SocialNetwork.trace.json → .../SocialDemoFiles/SocialNetwork.trace.json b/.../SocialDemoFiles/SocialNetwork.trace.json → .../SocialDemoFiles/SocialNetwork.trace.json
diff --git a/sample_data/workshop/priority.json → test/workshop/priority.json b/sample_data/workshop/priority.json → test/workshop/priority.json