Merge branch 'master' into polysat

src/test/ex.cpp

@@ -21,7 +21,7 @@ Revision History:
 
 class ex {
 public:
-    virtual ~ex() {}
+    virtual ~ex() = default;
     virtual char const * msg() const = 0;
 };
 

src/test/lp/smt_reader.h

@@ -20,7 +20,7 @@ Revision History:
 
 #pragma once
 
-// reads an MPS file reperesenting a Mixed Integer Program
+// reads an MPS file representing a Mixed Integer Program
 #include <string>
 #include <vector>
 #include <unordered_map>

src/test/simplex.cpp

@@ -149,7 +149,7 @@ static void test5() {
     add(M, vec(0, 0, 0, 0, 0, 0));
     M.display(std::cout);
     vector<vector<rational>> K;
-    kernel(M, K);
+    kernel_ffe(M, K);
     std::cout << "after\n";
     for (auto const& v : K)
         std::cout << v << "\n";
@@ -157,6 +157,39 @@ static void test5() {
 
 }
 
+static void test6() {
+  unsynch_mpq_manager m;
+  qmatrix M(m);
+  add(M, vec(-1, 2, 1));
+  add(M, vec(0, 1, 1));
+  M.display(std::cout);
+  vector<vector<rational>> K;
+  kernel_ffe(M, K);
+  std::cout << "Kernel:\n";
+  for (auto const &v : K)
+    std::cout << v << "\n";
+  std::cout << "matrix after\n";
+  M.display(std::cout);
+
+}
+
+static void test7() {
+  unsynch_mpq_manager m;
+  qmatrix M(m);
+  add(M, vec(1, 2, 3, 4, 10));
+  add(M, vec(2, 2, 3, 4, 11));
+  add(M, vec(3, 3, 3, 4, 13));
+  add(M, vec(9, 8, 7, 6, 30));
+  M.display(std::cout);
+  vector<vector<rational>> K;
+  kernel_ffe(M, K);
+  std::cout << "Kernel:\n";
+  for (auto const &v : K)
+    std::cout << v << "\n";
+  std::cout << "matrix after\n";
+  M.display(std::cout);
+}
+
 void tst_simplex() {
     reslimit rl; Simplex S(rl);
 
@@ -193,4 +226,6 @@ void tst_simplex() {
     test3();
     test4();
     test5();
+    test6();
+    test7();
 }