From 46476ab2b41644c0d308cb240b73f90503f1c919 Mon Sep 17 00:00:00 2001
From: Richard Wong <richard@richardwong.io>
Date: Wed, 8 May 2024 23:40:25 +0900
Subject: [PATCH] Chore: changed name of synthetic data folders, and include
 their symlinks

---
 synthetic_data/barabasi/.gitignore                  |  2 --
 synthetic_data/random_regular/.gitignore            |  1 +
 .../generate_graphs.bash                            | 13 ++++++-------
 synthetic_data/random_regular/make_regular_graph    |  1 +
 synthetic_data/regular/.gitignore                   |  2 --
 synthetic_data/scale_free/.gitignore                |  1 +
 .../{barabasi => scale_free}/generate_graphs.bash   | 13 ++++++-------
 synthetic_data/scale_free/make_scale_free_graph     |  1 +
 8 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 synthetic_data/barabasi/.gitignore
 create mode 100644 synthetic_data/random_regular/.gitignore
 rename synthetic_data/{regular => random_regular}/generate_graphs.bash (50%)
 create mode 120000 synthetic_data/random_regular/make_regular_graph
 delete mode 100644 synthetic_data/regular/.gitignore
 create mode 100644 synthetic_data/scale_free/.gitignore
 rename synthetic_data/{barabasi => scale_free}/generate_graphs.bash (50%)
 create mode 120000 synthetic_data/scale_free/make_scale_free_graph

diff --git a/synthetic_data/barabasi/.gitignore b/synthetic_data/barabasi/.gitignore
deleted file mode 100644
index c92f9d1..0000000
--- a/synthetic_data/barabasi/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-100*
-make_scale_free_graph
diff --git a/synthetic_data/random_regular/.gitignore b/synthetic_data/random_regular/.gitignore
new file mode 100644
index 0000000..6e1ae2b
--- /dev/null
+++ b/synthetic_data/random_regular/.gitignore
@@ -0,0 +1 @@
+100*
diff --git a/synthetic_data/regular/generate_graphs.bash b/synthetic_data/random_regular/generate_graphs.bash
similarity index 50%
rename from synthetic_data/regular/generate_graphs.bash
rename to synthetic_data/random_regular/generate_graphs.bash
index fba2a83..9de1960 100644
--- a/synthetic_data/regular/generate_graphs.bash
+++ b/synthetic_data/random_regular/generate_graphs.bash
@@ -2,23 +2,22 @@
 
 # Define the parameters
 num_node_range=(100 1000 10000)
-edge_multiplier_range=(2 3 5 10 20)
+degree_range=(2 3 5 10 20)
 copies=20
 seed=41
 
-max_jobs=2
+max_jobs=4
 running_jobs=0
 
 # Loop through different parameters
 for num_node in "${num_node_range[@]}"; do
-	for edge_multiplier in "${edge_multiplier_range[@]}"; do
-		num_edge=$((num_node * edge_multiplier))
-		output_folder="${num_node}n${num_edge}e"
+	for num_degree in "${degree_range[@]}"; do
+		output_folder="${num_node}n${num_degree}d"
 		mkdir -p $output_folder
 
 		# Run the program with the parameters
-		echo "run with $num_node nodes and $num_edge edges output to $output_folder"
-		./make_regular_graph $num_node $num_edge $copies $seed $output_folder &
+		echo "run with $num_node nodes and $num_degree degree output to $output_folder"
+		./make_regular_graph $num_node $num_degree $copies $seed $output_folder &
 
 		((running_jobs++))
 
diff --git a/synthetic_data/random_regular/make_regular_graph b/synthetic_data/random_regular/make_regular_graph
new file mode 120000
index 0000000..f1d73b9
--- /dev/null
+++ b/synthetic_data/random_regular/make_regular_graph
@@ -0,0 +1 @@
+../../make_graphs/bin/make_regular_graph
\ No newline at end of file
diff --git a/synthetic_data/regular/.gitignore b/synthetic_data/regular/.gitignore
deleted file mode 100644
index 7dd6445..0000000
--- a/synthetic_data/regular/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-100*
-make_regular_graph
diff --git a/synthetic_data/scale_free/.gitignore b/synthetic_data/scale_free/.gitignore
new file mode 100644
index 0000000..6e1ae2b
--- /dev/null
+++ b/synthetic_data/scale_free/.gitignore
@@ -0,0 +1 @@
+100*
diff --git a/synthetic_data/barabasi/generate_graphs.bash b/synthetic_data/scale_free/generate_graphs.bash
similarity index 50%
rename from synthetic_data/barabasi/generate_graphs.bash
rename to synthetic_data/scale_free/generate_graphs.bash
index fbef199..cf4c990 100644
--- a/synthetic_data/barabasi/generate_graphs.bash
+++ b/synthetic_data/scale_free/generate_graphs.bash
@@ -2,23 +2,22 @@
 
 # Define the parameters
 num_node_range=(100 1000 10000)
-edge_multiplier_range=(2 3 5 10 20)
+degree_range=(2 3 5 10 20)
 copies=20
 seed=41
 
-max_jobs=2
+max_jobs=4
 running_jobs=0
 
 # Loop through different parameters
 for num_node in "${num_node_range[@]}"; do
-	for edge_multiplier in "${edge_multiplier_range[@]}"; do
-		num_edge=$((num_node * edge_multiplier))
-		output_folder="${num_node}n${num_edge}e"
+	for num_degree in "${degree_range[@]}"; do
+		output_folder="${num_node}n${num_degree}d"
 		mkdir -p $output_folder
 
 		# Run the program with the parameters
-		echo "run with $num_node nodes and $num_edge edges output to $output_folder"
-		./make_scale_free_graph $num_node $num_edge $copies $seed $output_folder &
+		echo "run with $num_node nodes and $num_degree degree output to $output_folder"
+		./make_scale_free_graph $num_node $num_degree $copies $seed $output_folder &
 
 		((running_jobs++))
 
diff --git a/synthetic_data/scale_free/make_scale_free_graph b/synthetic_data/scale_free/make_scale_free_graph
new file mode 120000
index 0000000..8f5f2a2
--- /dev/null
+++ b/synthetic_data/scale_free/make_scale_free_graph
@@ -0,0 +1 @@
+../../make_graphs/bin/make_scale_free_graph
\ No newline at end of file