Skip to content

Commit b36ea3d

Browse files
authored
run sampling for matrices with greater dimensions
1 parent 6e0a6bc commit b36ea3d

File tree

1 file changed

+28
-12
lines changed

1 file changed

+28
-12
lines changed

examples/correlation_matrices/sampler.cpp

+28-12
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void correlation_matrix_uniform_sampling(const unsigned int n, const unsigned in
126126
time = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
127127
std::cout << "Elapsed time : " << time << " (ms)" << std::endl;
128128

129-
write_to_file<Point>(walkname + "_matrices.txt", randPoints);
129+
write_to_file<Point>(walkname + "_matrices" + std::to_string(n) + ".txt", randPoints);
130130
}
131131

132132
template<typename WalkType>
@@ -146,7 +146,18 @@ void correlation_matrix_uniform_sampling_MT(const unsigned int n, const unsigned
146146
time = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
147147
std::cout << "Elapsed time : " << time << " (ms)" << std::endl;
148148

149-
write_to_file<PointMT>(walkname + "_matrices_MT.txt", randPoints);
149+
int valid_points = 0;
150+
for(const auto& points : randPoints){
151+
if(is_correlation_matrix(points.mat)){
152+
valid_points++;
153+
}
154+
155+
}
156+
157+
158+
std::cout << "Number of valid points = " << valid_points << std::endl;
159+
160+
write_to_file<PointMT>(walkname + "_matrices_MT" + std::to_string(n) + ".txt", randPoints);
150161
}
151162

152163
int main(int argc, char const *argv[]){
@@ -166,25 +177,30 @@ int main(int argc, char const *argv[]){
166177
printf("\n");
167178
#endif
168179

169-
unsigned int n = 3, num_points = 5000;
180+
unsigned int num_points = 5000;
181+
182+
std::vector<unsigned int> dimensions = {3, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100};
170183

171-
old_uniform_sampling<BilliardWalk>(n, num_points);
184+
for(unsigned int n : dimensions){
172185

173-
correlation_matrix_uniform_sampling<BallWalk>(n, num_points, "BallWalk");
186+
old_uniform_sampling<BilliardWalk>(n, num_points);
174187

175-
correlation_matrix_uniform_sampling<RDHRWalk>(n, num_points, "RDHRWalk");
188+
correlation_matrix_uniform_sampling<BallWalk>(n, num_points, "BallWalk");
176189

177-
correlation_matrix_uniform_sampling<BilliardWalk>(n, num_points, "BilliardWalk");
190+
correlation_matrix_uniform_sampling<RDHRWalk>(n, num_points, "RDHRWalk");
178191

179-
correlation_matrix_uniform_sampling<AcceleratedBilliardWalk>(n, num_points, "AcceleratedBilliardWalk");
192+
correlation_matrix_uniform_sampling<BilliardWalk>(n, num_points, "BilliardWalk");
180193

181-
correlation_matrix_uniform_sampling_MT<BallWalk>(n, num_points, "BallWalk");
194+
correlation_matrix_uniform_sampling<AcceleratedBilliardWalk>(n, num_points, "AcceleratedBilliardWalk");
182195

183-
correlation_matrix_uniform_sampling_MT<RDHRWalk>(n, num_points, "RDHRWalk");
196+
correlation_matrix_uniform_sampling_MT<BallWalk>(n, num_points, "BallWalk");
184197

185-
correlation_matrix_uniform_sampling_MT<BilliardWalk>(n, num_points, "BilliardWalk");
198+
correlation_matrix_uniform_sampling_MT<RDHRWalk>(n, num_points, "RDHRWalk");
186199

187-
correlation_matrix_uniform_sampling_MT<AcceleratedBilliardWalk>(n, num_points, "AcceleratedBilliardWalk");
200+
correlation_matrix_uniform_sampling_MT<BilliardWalk>(n, num_points, "BilliardWalk");
201+
202+
correlation_matrix_uniform_sampling_MT<AcceleratedBilliardWalk>(n, num_points, "AcceleratedBilliardWalk");
203+
}
188204

189205
return 0;
190206
}

0 commit comments

Comments
 (0)