(Far) more efficient sample generation

3 files changed, 8 insertions, 243 deletions

diff --git a/config.c b/config.c
deleted file mode 100644
index f2c8a32..0000000
--- a/config.c
+++ /dev/null
@@ -1 +0,0 @@
-unsigned int SIZE=1120;unsigned int ITERATIONS=50;float POWER=2.00;
diff --git a/gen-pow-imagery b/gen-pow-imagery
index 1d785e3..4906933 100755
--- a/gen-pow-imagery
+++ b/gen-pow-imagery
@@ -31,223 +31,7 @@ make_sample () {
 	fi
 }
 
-make_sample 560 50 0.01
-make_sample 560 50 0.02
-make_sample 560 50 0.03
-make_sample 560 50 0.04
-make_sample 560 50 0.05
-make_sample 560 50 0.06
-make_sample 560 50 0.07
-make_sample 560 50 0.08
-make_sample 560 50 0.09
-make_sample 560 50 0.10
+for pow in $(seq 0.01 0.01 2); do
+	make_sample 560 50 $pow
+done
 
-make_sample 560 50 0.11
-make_sample 560 50 0.12
-make_sample 560 50 0.13
-make_sample 560 50 0.14
-make_sample 560 50 0.15
-make_sample 560 50 0.16
-make_sample 560 50 0.17
-make_sample 560 50 0.18
-make_sample 560 50 0.19
-
-make_sample 560 50 0.20
-make_sample 560 50 0.21
-make_sample 560 50 0.22
-make_sample 560 50 0.23
-make_sample 560 50 0.24
-make_sample 560 50 0.25
-make_sample 560 50 0.26
-make_sample 560 50 0.27
-make_sample 560 50 0.28
-make_sample 560 50 0.29
-
-make_sample 560 50 0.30
-make_sample 560 50 0.31
-make_sample 560 50 0.32
-make_sample 560 50 0.33
-make_sample 560 50 0.34
-make_sample 560 50 0.35
-make_sample 560 50 0.36
-make_sample 560 50 0.37
-make_sample 560 50 0.38
-make_sample 560 50 0.39
-
-make_sample 560 50 0.40
-make_sample 560 50 0.41
-make_sample 560 50 0.42
-make_sample 560 50 0.43
-make_sample 560 50 0.44
-make_sample 560 50 0.45
-make_sample 560 50 0.46
-make_sample 560 50 0.47
-make_sample 560 50 0.48
-make_sample 560 50 0.49
-
-make_sample 560 50 0.50
-make_sample 560 50 0.51
-make_sample 560 50 0.52
-make_sample 560 50 0.53
-make_sample 560 50 0.54
-make_sample 560 50 0.55
-make_sample 560 50 0.56
-make_sample 560 50 0.57
-make_sample 560 50 0.58
-make_sample 560 50 0.59
-
-make_sample 560 50 0.60
-make_sample 560 50 0.61
-make_sample 560 50 0.62
-make_sample 560 50 0.63
-make_sample 560 50 0.64
-make_sample 560 50 0.65
-make_sample 560 50 0.66
-make_sample 560 50 0.67
-make_sample 560 50 0.68
-make_sample 560 50 0.69
-
-make_sample 560 50 0.70
-make_sample 560 50 0.71
-make_sample 560 50 0.72
-make_sample 560 50 0.73
-make_sample 560 50 0.74
-make_sample 560 50 0.75
-make_sample 560 50 0.76
-make_sample 560 50 0.77
-make_sample 560 50 0.78
-make_sample 560 50 0.79
-
-make_sample 560 50 0.80
-make_sample 560 50 0.81
-make_sample 560 50 0.82
-make_sample 560 50 0.83
-make_sample 560 50 0.84
-make_sample 560 50 0.85
-make_sample 560 50 0.86
-make_sample 560 50 0.87
-make_sample 560 50 0.88
-make_sample 560 50 0.89
-
-make_sample 560 50 0.90
-make_sample 560 50 0.91
-make_sample 560 50 0.92
-make_sample 560 50 0.93
-make_sample 560 50 0.94
-make_sample 560 50 0.95
-make_sample 560 50 0.96
-make_sample 560 50 0.97
-make_sample 560 50 0.98
-make_sample 560 50 0.99
-
-make_sample 560 50 1.00
-make_sample 560 50 1.01
-make_sample 560 50 1.02
-make_sample 560 50 1.03
-make_sample 560 50 1.04
-make_sample 560 50 1.05
-make_sample 560 50 1.06
-make_sample 560 50 1.07
-make_sample 560 50 1.08
-make_sample 560 50 1.09
-
-make_sample 560 50 1.10
-make_sample 560 50 1.11
-make_sample 560 50 1.12
-make_sample 560 50 1.13
-make_sample 560 50 1.14
-make_sample 560 50 1.15
-make_sample 560 50 1.16
-make_sample 560 50 1.17
-make_sample 560 50 1.18
-make_sample 560 50 1.19
-
-make_sample 560 50 1.20
-make_sample 560 50 1.21
-make_sample 560 50 1.22
-make_sample 560 50 1.23
-make_sample 560 50 1.24
-make_sample 560 50 1.25
-make_sample 560 50 1.26
-make_sample 560 50 1.27
-make_sample 560 50 1.28
-make_sample 560 50 1.29
-
-make_sample 560 50 1.30
-make_sample 560 50 1.31
-make_sample 560 50 1.32
-make_sample 560 50 1.33
-make_sample 560 50 1.34
-make_sample 560 50 1.35
-make_sample 560 50 1.36
-make_sample 560 50 1.37
-make_sample 560 50 1.38
-make_sample 560 50 1.39
-
-make_sample 560 50 1.40
-make_sample 560 50 1.41
-make_sample 560 50 1.42
-make_sample 560 50 1.43
-make_sample 560 50 1.44
-make_sample 560 50 1.45
-make_sample 560 50 1.46
-make_sample 560 50 1.47
-make_sample 560 50 1.48
-make_sample 560 50 1.49
-
-make_sample 560 50 1.50
-make_sample 560 50 1.51
-make_sample 560 50 1.52
-make_sample 560 50 1.53
-make_sample 560 50 1.54
-make_sample 560 50 1.55
-make_sample 560 50 1.56
-make_sample 560 50 1.57
-make_sample 560 50 1.58
-make_sample 560 50 1.59
-
-make_sample 560 50 1.60
-make_sample 560 50 1.61
-make_sample 560 50 1.62
-make_sample 560 50 1.63
-make_sample 560 50 1.64
-make_sample 560 50 1.65
-make_sample 560 50 1.66
-make_sample 560 50 1.67
-make_sample 560 50 1.68
-make_sample 560 50 1.69
-
-make_sample 560 50 1.70
-make_sample 560 50 1.71
-make_sample 560 50 1.72
-make_sample 560 50 1.73
-make_sample 560 50 1.74
-make_sample 560 50 1.75
-make_sample 560 50 1.76
-make_sample 560 50 1.77
-make_sample 560 50 1.78
-make_sample 560 50 1.79
-
-make_sample 560 50 1.80
-make_sample 560 50 1.81
-make_sample 560 50 1.82
-make_sample 560 50 1.83
-make_sample 560 50 1.84
-make_sample 560 50 1.85
-make_sample 560 50 1.86
-make_sample 560 50 1.87
-make_sample 560 50 1.88
-make_sample 560 50 1.89
-
-make_sample 560 50 1.90
-make_sample 560 50 1.91
-make_sample 560 50 1.92
-make_sample 560 50 1.93
-make_sample 560 50 1.94
-make_sample 560 50 1.95
-make_sample 560 50 1.96
-make_sample 560 50 1.97
-make_sample 560 50 1.98
-make_sample 560 50 1.99
-
-make_sample 560 50 2.00
diff --git a/generate-samples b/generate-samples
index 54ccc71..6cdd2fb 100755
--- a/generate-samples
+++ b/generate-samples
@@ -25,26 +25,8 @@ make_sample () {
 	rm $OUT_DIR/$1-$2-$3pow.raw
 }
 
-make_sample   35 10 2
-make_sample   70 10 2
-make_sample  140 10 2
-make_sample  280 10 2
-make_sample  560 10 2
-make_sample 1120 10 2
-make_sample 2240 10 2
-
-make_sample   35 50 2
-make_sample   70 50 2
-make_sample  140 50 2
-make_sample  280 50 2
-make_sample  560 50 2
-make_sample 1120 50 2
-make_sample 2240 50 2
-
-make_sample   35 100 2
-make_sample   70 100 2
-make_sample  140 100 2
-make_sample  280 100 2
-make_sample  560 100 2
-make_sample 1120 100 2
-make_sample 2240 100 2
+for it in 10 50 100; do
+	for res in 35 70 140 280 560 1120 2240; do
+		make_sample $res $it 2
+	done
+done