improving scaling

Author: rostam

ConjectureCheck/ConjectureCheck.h

@@ -16,6 +16,4 @@ class ConjectureCheck {
     std::map<std::string, vector<std::string>> CheckReturn(ConjectureType ct, std::unique_ptr<ReportInterface> r,
             std::string input_file_name);
 };
-
-
 #endif //CGTEA_CONJECTURECHECK_H

ConjectureCheck/TeaTable.h

@@ -140,16 +140,14 @@ typedef boost::graph_traits<Graph>::adjacency_iterator AdjacencyIterator;
 
 template<typename Lambda>
 static void for_each_neighbor_const(const Ver& v, const Graph& g, Lambda func) {
-    AdjacencyIterator vi, vi_end;
-    std::tie(vi, vi_end) = boost::adjacent_vertices(v, g);
+    auto [vi, vi_end] = boost::adjacent_vertices(v, g);
     std::for_each(vi,vi_end,func);
 }
 
 
 template<typename Lambda>
 static void for_each_neighbor(const Ver& v, Graph& g, Lambda func) {
-    AdjacencyIterator vi, vi_end;
-    std::tie(vi, vi_end) = boost::adjacent_vertices(v, g);
+    auto [vi, vi_end] = boost::adjacent_vertices(v, g);
     std::for_each(vi,vi_end,func);
 }
 
@@ -161,8 +159,6 @@ static void for_each_out_edges(const Ver& v, Graph& g, Lambda func) {
 }
 
 typedef boost::rectangle_topology<> topology_type;
-
-
 typedef boost::exterior_vertex_property<Graph, int> DistanceProperty;
 typedef DistanceProperty::matrix_type DistanceMatrix;
 typedef DistanceProperty::matrix_map_type DistanceMatrixMap;

datatypes.h

@@ -11,7 +11,7 @@
  * - Reference: https://mathworld.wolfram.com/CocktailPartyGraph.html
  * - A graph consisting of two rows of paired nodes in which all nodes 
  *   except the paired ones are connected with straight lines
- * - So called because it can be visualised as the set of handshakes 
+ * - So-called because it can be visualized as the set of handshakes
  *   if n couples go to a party and each person shakes hands with every person except his or her partner. 
  * 
  */
@@ -22,15 +22,13 @@ class CocktailParty : public GeneratorInterface {
 
     Graph generate_with_positions(unsigned int n, unsigned int k, double width, double height) override {
         Graph g;
-
-
         for (int i = 0; i < n; i++) {
             for (int j = 0; j < n; j++) {
                 if (i == j) continue;
                  add_edge(i, n + j, g);
                  add_edge(i,j, g);
                  add_edge(n+i,n+j, g);
-                
+
             }
         }
         std::vector<cgtea_geometry::Point> pos = position_generators::circle(width, height, 200.0, 2*n);

generators/CocktailParty.h

@@ -12,6 +12,7 @@
 
 class GeneratorInterface {
 public:
+    virtual ~GeneratorInterface() = default;
     virtual Graph generate(unsigned int n, unsigned int k) { return Graph(); };
 
     virtual Graph

generators/GeneratorInterface.h

@@ -11,9 +11,8 @@ class Pmn : public GeneratorInterface {
 public:
     explicit Pmn() : GeneratorInterface() {};
 
-    Graph generate(unsigned int n, unsigned int k) override {
+    Graph generate(unsigned int n, unsigned int m) override {
         Graph g;
-        
         for (int i = 0; i < n; i++)
             for (int j = 0; j < m; j++) {
                 if (j < m - 1) {

generators/Pmn.h

@@ -10,6 +10,7 @@
 
 class ReportInterface {
 public:
+    virtual ~ReportInterface() = default;
     virtual string report(const Graph& g) = 0;
     [[nodiscard]] virtual string name() const = 0;
     [[nodiscard]] virtual string description() const = 0;