Merge branch 'hotfix/0.1.3'

acgetchell · acgetchell · commit 3262220aad38 · 2017-11-29T03:12:56.000-08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -162,11 +162,16 @@ set_tests_properties (CDT-3Dtriangle
   PROPERTIES
   PASS_REGULAR_EXPRESSION "Triangle inequalities violated ... Exiting.")
 
+# Minimum run
+add_test(CDT-MinimalS3 cdt --s -n2 -t2 -a0.6 -k1.1 -l0.1 -p10 -c1)
+set_tests_properties(CDT-MinimalS3
+        PROPERTIES
+        PASS_REGULAR_EXPRESSION "Writing to file S3")
 #Run an S3
 add_test(CDT-S3Runs cdt --s -n640 -t4 -a0.6 -k1.1 -l0.1 -p10 -c1)
 set_tests_properties(CDT-S3Runs
         PROPERTIES
-        PASS_REGULAR_EXPRESSION "Writing to file S")
+        PASS_REGULAR_EXPRESSION "Writing to file S3")
 #cdt - gv
 #This program takes a file to load into GemoView for visualization
 #add_test(CDT - GeomView cdt - gv)
diff --git a/src/Measurements.h b/src/Measurements.h
@@ -27,10 +27,10 @@ template <typename T>
 auto VolumePerTimeslice(T&& manifold) -> decltype(manifold)
 {
 #ifndef NDEBUG
-  std::cout << __PRETTY_FUNCTION__ << " called." << std::endl;
+  std::cout << __PRETTY_FUNCTION__ << " called.\n";
 #endif
 
-//  manifold.update();
+  //  manifold.update();
   print_results(manifold);
 
   std::multimap<intmax_t, Facet>   spacelike_facets;
@@ -45,30 +45,30 @@ auto VolumePerTimeslice(T&& manifold) -> decltype(manifold)
     // Now the index of the facet in the cell
     auto index_of_facet = fit->second;
 #ifdef DETAILED_DEBUGGING
-    std::cout << "Facet index is " << index_of_facet << std::endl;
+    std::cout << "Facet index is " << index_of_facet << "\n";
 #endif
     std::set<intmax_t> facet_timevalues;
     // The vertices of the facet are the ones that aren't the index
     for (auto i = 0; i < 4; ++i) {
       if (i != index_of_facet) {
 #ifdef DETAILED_DEBUGGING
         std::cout << "Vertex[" << i << "] has timevalue "
-                  << cell->vertex(i)->info() << std::endl;
+                  << cell->vertex(i)->info() << "\n";
 #endif
         facet_timevalues.insert(std::move(cell->vertex(i)->info()));
       }
     }
     // If we have a 1-element set then all timevalues on that facet are equal
     if (facet_timevalues.size() == 1) {
 #ifdef DETAILED_DEBUGGING
-      std::cout << "Timevalue is " << facet_timevalues.front() << std::endl;
+      std::cout << "Timevalue is " << facet_timevalues.front() << "\n";
 #endif
       spacelike_facets.insert({*facet_timevalues.begin(), *fit});
     }
   }
 #ifndef NDEBUG
   std::cout << "Number of spacelike faces is " << spacelike_facets.size()
-            << std::endl;
+            << "\n";
 #endif
 
   // Determine which timevalues are populated
@@ -79,12 +79,12 @@ auto VolumePerTimeslice(T&& manifold) -> decltype(manifold)
 
   auto min_timevalue = *timevalues.cbegin();
   auto max_timevalue = *timevalues.crbegin();
-  std::cout << "Minimum timevalue is " << min_timevalue << std::endl;
-  std::cout << "Maximum timevalue is " << max_timevalue << std::endl;
+  std::cout << "Minimum timevalue is " << min_timevalue << "\n";
+  std::cout << "Maximum timevalue is " << max_timevalue << "\n";
 
   for (auto j = min_timevalue; j <= max_timevalue; ++j) {
     std::cout << "Timeslice " << j << " has " << spacelike_facets.count(j)
-              << " spacelike faces." << std::endl;
+              << " spacelike faces.\n";
   }
 
   // Save values in GeomInfo struct
diff --git a/src/Metropolis.h b/src/Metropolis.h
@@ -83,7 +83,7 @@ class Metropolis : public MoveAlgorithm
       : MoveAlgorithm(passes, checkpoint), Alpha_(Alpha), K_(K), Lambda_(Lambda)
   {
 #ifndef NDEBUG
-    std::cout << __PRETTY_FUNCTION__ << " called." << std::endl;
+    std::cout << __PRETTY_FUNCTION__ << " called.\n";
 #endif
   }
 
@@ -152,8 +152,8 @@ class Metropolis : public MoveAlgorithm
     mpfr_clears(r1, r2, a1, nullptr);
 
 #ifndef NDEBUG
-    std::cout << "TotalMoves() = " << total_moves << std::endl;
-    std::cout << "A1 is " << result << std::endl;
+    std::cout << "TotalMoves() = " << total_moves << "\n";
+    std::cout << "A1 is " << result << "\n";
 #endif
 
     return result;
@@ -201,7 +201,7 @@ class Metropolis : public MoveAlgorithm
 // A (4,4) move changes nothing with respect to the action,
 // and e^0==1
 #ifndef NDEBUG
-        std::cout << "A2 is 1" << std::endl;
+        std::cout << "A2 is 1\n";
 #endif
         return static_cast<double>(1);
     }
@@ -235,7 +235,7 @@ class Metropolis : public MoveAlgorithm
     mpfr_clears(r1, a2, nullptr);
 
 #ifndef NDEBUG
-    std::cout << "A2 is " << result << std::endl;
+    std::cout << "A2 is " << result << "\n";
 #endif
 
     return result;
@@ -263,9 +263,9 @@ class Metropolis : public MoveAlgorithm
     const auto trial = static_cast<double>(trial_value);
 
 #ifndef NDEBUG
-    std::cout << __PRETTY_FUNCTION__ << " called." << std::endl;
-    std::cout << "trial_value = " << trial_value << std::endl;
-    std::cout << "trial = " << trial << std::endl;
+    std::cout << __PRETTY_FUNCTION__ << " called.\n";
+    std::cout << "trial_value = " << trial_value << "\n";
+    std::cout << "trial = " << trial << "\n";
 #endif
 
     if (trial <= a1 * a2) {
@@ -280,15 +280,15 @@ class Metropolis : public MoveAlgorithm
     }
 
 #ifndef NDEBUG
-    std::cout << __PRETTY_FUNCTION__ << " called." << std::endl;
-    std::cout << "Attempting move." << std::endl;
-    std::cout << "Move type = " << to_integral(move) << std::endl;
-    std::cout << "Trial = " << trial << std::endl;
-    std::cout << "A1 = " << a1 << std::endl;
-    std::cout << "A2 = " << a2 << std::endl;
-    std::cout << "A1*A2 = " << a1 * a2 << std::endl;
+    std::cout << __PRETTY_FUNCTION__ << " called.\n";
+    std::cout << "Attempting move.\n";
+    std::cout << "Move type = " << to_integral(move) << "\n";
+    std::cout << "Trial = " << trial << "\n";
+    std::cout << "A1 = " << a1 << "\n";
+    std::cout << "A2 = " << a2 << "\n";
+    std::cout << "A1*A2 = " << a1 * a2 << "\n";
     std::cout << ((trial <= a1 * a2) ? "Move accepted." : "Move rejected.")
-              << std::endl;
+              << "\n";
     print_run();
 #endif
   }  // attempt_move()
@@ -308,7 +308,7 @@ class Metropolis : public MoveAlgorithm
   auto operator()(T&& universe) -> decltype(universe)
   {
 #ifndef NDEBUG
-    std::cout << __PRETTY_FUNCTION__ << " called." << std::endl;
+    std::cout << __PRETTY_FUNCTION__ << " called.\n";
 #endif
     std::cout << "Starting Metropolis-Hastings algorithm ...\n";
     // Populate member data
@@ -332,11 +332,11 @@ class Metropolis : public MoveAlgorithm
     }
     catch (std::logic_error& LogicError)
     {
-      std::cerr << LogicError.what() << std::endl;
-      std::cerr << "Metropolis initialization failed ... Exiting." << std::endl;
+      std::cerr << LogicError.what() << "\n";
+      std::cerr << "Metropolis initialization failed ... Exiting.\n";
     }
 
-    std::cout << "Making random moves ..." << std::endl;
+    std::cout << "Making random moves ...\n";
     // Loop through passes_
     for (std::intmax_t pass_number = 1; pass_number <= passes_; ++pass_number) {
       auto total_simplices_this_pass = CurrentTotalSimplices();
@@ -347,7 +347,7 @@ class Metropolis : public MoveAlgorithm
         // Pick a move to attempt
         auto move_choice = generate_random_signed(0, 3);
 #ifndef NDEBUG
-        std::cout << "Move choice = " << move_choice << std::endl;
+        std::cout << "Move choice = " << move_choice << "\n";
 #endif
 
         // Convert std::intmax_t move_choice to move_type enum
@@ -357,15 +357,15 @@ class Metropolis : public MoveAlgorithm
 
       // Do stuff on checkpoint_
       if ((pass_number % checkpoint_) == 0) {
-        std::cout << "Pass " << pass_number << std::endl;
+        std::cout << "Pass " << pass_number << "\n";
         // write results to a file
         write_file(universe_, topology_type::SPHERICAL, 3,
                    universe_.geometry->number_of_cells(),
                    universe_.geometry->max_timevalue().get());
       }
     }  // End loop through passes_
     // output results
-    std::cout << "Run results: " << std::endl;
+    std::cout << "Run results: \n";
     print_run();
     return universe_;
   }
diff --git a/src/MoveAlgorithm.h b/src/MoveAlgorithm.h
@@ -42,7 +42,7 @@ class MoveAlgorithm
       : passes_(passes), checkpoint_(checkpoint)
   {
 #ifndef NDEBUG
-    std::cout << __PRETTY_FUNCTION__ << " called." << std::endl;
+    std::cout << __PRETTY_FUNCTION__ << " called.\n";
 #endif
   }
 
@@ -85,7 +85,7 @@ class MoveAlgorithm
   void make_move(const move_type move)
   {
 #ifndef NDEBUG
-    std::cout << __PRETTY_FUNCTION__ << " called." << std::endl;
+    std::cout << __PRETTY_FUNCTION__ << " called.\n";
 #endif
 
     // Make working copies
@@ -228,27 +228,25 @@ class MoveAlgorithm
   /// @brief Displays results of run to standard output
   void print_run()
   {
-    std::cout << "Simplices: " << CurrentTotalSimplices() << std::endl;
+    std::cout << "Simplices: " << CurrentTotalSimplices() << "\n";
     std::cout << "Timeslices: "
-              << this->universe_.geometry->max_timevalue().get() << std::endl;
-    std::cout << "N3_31_13_: " << N3_31_13_ << std::endl;
-    std::cout << "N3_22_: " << N3_22_ << std::endl;
-    std::cout << "Timelike edges: " << N1_TL_ << std::endl;
+              << this->universe_.geometry->max_timevalue().get() << "\n";
+    std::cout << "N3_31_13_: " << N3_31_13_ << "\n";
+    std::cout << "N3_22_: " << N3_22_ << "\n";
+    std::cout << "Timelike edges: " << N1_TL_ << "\n";
     std::cout << "Successful (2,3) moves: " << SuccessfulTwoThreeMoves()
-              << std::endl;
-    std::cout << "Attempted (2,3) moves: " << TwoThreeMoves() << std::endl;
+              << "\n";
+    std::cout << "Attempted (2,3) moves: " << TwoThreeMoves() << "\n";
     std::cout << "Successful (3,2) moves: " << SuccessfulThreeTwoMoves()
-              << std::endl;
-    std::cout << "Attempted (3,2) moves: " << ThreeTwoMoves() << std::endl;
-    std::cout << "Successful (2,6) moves: " << SuccessfulTwoSixMoves()
-              << std::endl;
-    std::cout << "Attempted (2,6) moves: " << TwoSixMoves() << std::endl;
-    std::cout << "Successful (6,2) moves: " << SuccessfulSixTwoMoves()
-              << std::endl;
-    std::cout << "Attempted (6,2) moves: " << SixTwoMoves() << std::endl;
+              << "\n";
+    std::cout << "Attempted (3,2) moves: " << ThreeTwoMoves() << "\n";
+    std::cout << "Successful (2,6) moves: " << SuccessfulTwoSixMoves() << "\n";
+    std::cout << "Attempted (2,6) moves: " << TwoSixMoves() << "\n";
+    std::cout << "Successful (6,2) moves: " << SuccessfulSixTwoMoves() << "\n";
+    std::cout << "Attempted (6,2) moves: " << SixTwoMoves() << "\n";
     std::cout << "Successful (4,4) moves: " << SuccessfulFourFourMoves()
-              << std::endl;
-    std::cout << "Attempted (4,4) moves: " << FourFourMoves() << std::endl;
+              << "\n";
+    std::cout << "Attempted (4,4) moves: " << FourFourMoves() << "\n";
   }
 };  // MoveAlgorithm
 
diff --git a/src/S3ErgodicMoves.h b/src/S3ErgodicMoves.h
@@ -48,6 +48,7 @@ template <typename T>
 auto try_23_move(T&& universe, Cell_handle to_be_moved)
 {
   auto flipped = false;
+  // Try every facet of the cell
   for (auto i = 0; i < 4; ++i) {
     if (universe.triangulation->flip(to_be_moved, i)) {
 #ifndef NDEBUG
@@ -83,17 +84,25 @@ template <typename T1, typename T2>
 auto make_23_move(T1&& universe, T2&& attempted_moves) -> decltype(universe)
 {
 #ifndef NDEBUG
-  std::cout << __PRETTY_FUNCTION__ << " called.\n";
+  std::cout << "Attempting (2,3) move.\n";
 #endif
 
+  auto movable_two_two_cells{universe.geometry->two_two};
+
   auto not_flipped = true;
   while (not_flipped) {
+    if (movable_two_two_cells.size() == 0) {
+      throw std::domain_error("No (2,3) move is possible.");
+    }
     // Pick out a random (2,2) which ranges from 0 to size()-1
-    auto choice = generate_random_signed(0, universe.geometry->N3_22() - 1);
+    auto choice = generate_random_signed(0, movable_two_two_cells.size() - 1);
 
     Cell_handle to_be_moved = universe.geometry->two_two[choice];
     if (try_23_move(universe, to_be_moved)) not_flipped = false;
 
+    // Remove trial cell
+    movable_two_two_cells.erase(movable_two_two_cells.begin() + choice);
+
     // Increment the (2,3) move counter
     ++attempted_moves[0];
   }
@@ -143,12 +152,17 @@ auto make_32_move(T1&& universe, T2&& attempted_moves) -> decltype(universe)
   std::cout << "Attempting (3,2) move.\n";
 #endif
 
+  auto movable_timelike_edges{universe.geometry->timelike_edges};
+
   auto not_flipped = true;
   while (not_flipped) {
+    if (movable_timelike_edges.size() == 0) {
+      throw std::domain_error("No (3,2) move is possible.");
+    }
     // Pick a random timelike edge out of the timelike_edges vector
     // which ranges from 0 to size()-1
-    auto choice = generate_random_signed(0, universe.geometry->N1_TL() - 1);
-    Edge_handle to_be_moved = universe.geometry->timelike_edges[choice];
+    auto choice = generate_random_signed(0, movable_timelike_edges.size() - 1);
+    Edge_handle to_be_moved = movable_timelike_edges[choice];
 
     if (try_32_move(universe, to_be_moved)) {
 #ifndef NDEBUG
@@ -158,6 +172,8 @@ auto make_32_move(T1&& universe, T2&& attempted_moves) -> decltype(universe)
     }
     else
     {
+      // Remove chosen edge to try remaining
+      movable_timelike_edges.erase(movable_timelike_edges.begin() + choice);
 #ifndef NDEBUG
       std::cout << "Edge " << choice << " was not flippable.\n";
 #endif
@@ -469,6 +485,9 @@ auto find_62_movable(T&& universe, Vertex_handle candidate)
 template <typename T1, typename T2>
 auto make_62_move(T1&& universe, T2&& attempted_moves) -> decltype(universe)
 {
+#ifndef NDEBUG
+  std::cout << "Attempting (6,2) move.\n";
+#endif
   std::vector<Vertex_handle> tds_vertices      = universe.geometry->vertices;
   auto                       not_moved         = true;
   intmax_t                   tds_vertices_size = tds_vertices.size();
@@ -516,6 +535,9 @@ auto make_62_move(T1&& universe, T2&& attempted_moves) -> decltype(universe)
 template <typename T1, typename T2>
 auto make_44_move(T1&& universe, T2&& attempted_moves) -> decltype(universe)
 {
+#ifndef NDEBUG
+  std::cout << "Attempting (4,4) move.\n";
+#endif
   std::vector<Edge_handle> movable_spacelike_edges{
       universe.geometry->spacelike_edges};
 
diff --git a/src/Utilities.h b/src/Utilities.h
