Commit 7c478918 authored by Sabrina Templeton's avatar Sabrina Templeton
Browse files

Revertinh accidental commit

parent d535206c
......@@ -315,10 +315,6 @@ PowerDiagram::evaluate_objective( index_t n , const real_t* x , real_t* grad ) {
min_vol,max_vol,regularization_total
);
FILE * pFile;
pFile = fopen ("avro_results.txt", "a");
fprintf(pFile, "%12.3e\n", time_voronoi_ );
return multiplier*energy_;
}
......
Subproject commit 91a6e129d9274a0b10943044e5aeae08471e00fe
Subproject commit 617cb653ec513b4e02d7104b05fb75c26d10e79e
......@@ -19,7 +19,7 @@ UT_TEST_CASE( test_2d )
static coord_t number = 2;
static coord_t dim = number;
index_t nb_points = 50;
index_t nb_points = 1e4;
index_t N = 2;
std::vector<index_t> dims(number,N);
......@@ -92,23 +92,11 @@ UT_TEST_CASE( test_2d )
Points sites(dim);
#if 0 // test exactness
ckf.points().copy( sites );
nb_points = sites.nb();
#elif SPHERE == 0
srand(24);
// std::cout << "here" << std::endl;
// for (index_t k = 0; k < 50; k++){
// std::cout << random_within(0.0,1.0) << std::endl;
// }
for (index_t k = 0; k < nb_points; k++) {
for (coord_t d = 0; d < number; d++){
for (coord_t d = 0; d < number; d++)
point[d] = random_within(0.0,1.0);
//std::cout << point[d] << std::endl;
}
sites.create(point);
}
#else
......@@ -138,7 +126,7 @@ UT_TEST_CASE( test_2d )
diagram.set_sites( sites );
diagram.initialize();
diagram.optimize_points_lloyd(1);
diagram.optimize_points_lloyd(20);
std::vector<real_t> mass( sites.nb() , diagram.volume() / real_t(sites.nb()) );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment