Conditional compile with compact logic

Author: whart222

test/aml_comparisons/coek/models/jump/fac_compact.cpp

@@ -1,8 +1,8 @@
 #include <cmath>
 #include <coek/coek.hpp>
 #include <cstdlib>
-#include <vector>
 
+#ifdef COEK_WITH_COMPACT_MODEL
 void fac_compact(coek::CompactModel& model, size_t F)
 {
     size_t G = F;
@@ -56,3 +56,4 @@ void fac_compact(coek::CompactModel& model, size_t F)
         r(i, j, f, 0) * r(i, j, f, 0) + r(i, j, f, 1) * r(i, j, f, 1) <= s(i, j, f) * s(i, j, f),
         coek::Forall(i).In(Gp).Forall(j).In(Gp).Forall(f).In(Fset)));
 }
+#endif

test/aml_comparisons/coek/models/misc/knapsack_compact.cpp

@@ -2,10 +2,10 @@
 #include <functional>
 #include <map>
 #include <random>
-// #include <vector>
 #include <iostream>
 #include <coek/util/io_utils.hpp>
 
+#ifdef COEK_WITH_COMPACT_MODEL
 void knapsack_compact(coek::CompactModel& model, size_t N)
 {
     N *= 1000;
@@ -35,3 +35,4 @@ void knapsack_compact(coek::CompactModel& model, size_t N)
     // con
     model.add(coek::constraint("con", coek::Sum(w(i) * x(i), coek::Forall(i).In(I)) <= W));
 }
+#endif

test/aml_comparisons/coek/models/misc/nqueens_compact.cpp

@@ -2,6 +2,7 @@
 #include <map>
 #include <vector>
 
+#ifdef COEK_WITH_COMPACT_MODEL
 void nqueens_compact(coek::CompactModel& model, size_t N)
 {
     auto Rows = coek::RangeSet(0, N - 1);
@@ -45,3 +46,4 @@ void nqueens_compact(coek::CompactModel& model, size_t N)
             <= 1,
         coek::Forall(i).In(coek::RangeSet(1, N - 2))));
 }
+#endif

test/aml_comparisons/coek/models/misc/pmedian_compact.cpp

@@ -1,6 +1,7 @@
 #include <coek/coek.hpp>
 #include <map>
 
+#ifdef COEK_WITH_COMPACT_MODEL
 void pmedian_compact(coek::CompactModel& model, size_t N, size_t P)
 {
     size_t M = N;  // Customers
@@ -34,3 +35,4 @@ void pmedian_compact(coek::CompactModel& model, size_t N, size_t P)
     model.add(
         coek::constraint("num_facilities", coek::Sum(y(n), coek::Forall(n).In(Locations)) == P));
 }
+#endif