From f6fd426c2808442ad9ca5ff3c7c4c3bdabcd5a26 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Tue, 21 Jan 2014 08:46:02 -0800
Subject: [PATCH] moved network flow

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 src/{smt => math/simplex}/network_flow.h     | 0
 src/{smt => math/simplex}/network_flow_def.h | 0
 src/math/simplex/simplex_def.h               | 1 -
 src/smt/theory_diff_logic.h                  | 1 -
 src/smt/theory_diff_logic_def.h              | 9 ++++++++-
 5 files changed, 8 insertions(+), 3 deletions(-)
 rename src/{smt => math/simplex}/network_flow.h (100%)
 rename src/{smt => math/simplex}/network_flow_def.h (100%)

diff --git a/src/smt/network_flow.h b/src/math/simplex/network_flow.h
similarity index 100%
rename from src/smt/network_flow.h
rename to src/math/simplex/network_flow.h
diff --git a/src/smt/network_flow_def.h b/src/math/simplex/network_flow_def.h
similarity index 100%
rename from src/smt/network_flow_def.h
rename to src/math/simplex/network_flow_def.h
diff --git a/src/math/simplex/simplex_def.h b/src/math/simplex/simplex_def.h
index b92ec7551..0e05de291 100644
--- a/src/math/simplex/simplex_def.h
+++ b/src/math/simplex/simplex_def.h
@@ -213,7 +213,6 @@ namespace simplex {
             em.div(delta2, si.m_base_coeff, delta2);
             delta2.neg();
             update_value_core(s, delta2);
-            // TBD m.add(si.m_base_coeff, delta2, si.m_base_coeff); 
         }            
     }    
 
diff --git a/src/smt/theory_diff_logic.h b/src/smt/theory_diff_logic.h
index ed52b76fc..dff1b718c 100644
--- a/src/smt/theory_diff_logic.h
+++ b/src/smt/theory_diff_logic.h
@@ -38,7 +38,6 @@ Revision History:
 #include"numeral_factory.h"
 #include"smt_clause.h"
 #include"theory_opt.h"
-#include"network_flow.h"
 
 // The DL theory can represent term such as n + k, where n is an enode and k is a numeral.
 namespace smt {
diff --git a/src/smt/theory_diff_logic_def.h b/src/smt/theory_diff_logic_def.h
index 1982f2eb7..3dc9d3a7f 100644
--- a/src/smt/theory_diff_logic_def.h
+++ b/src/smt/theory_diff_logic_def.h
@@ -28,7 +28,6 @@ Revision History:
 #include"ast_pp.h"
 #include"warning.h"
 #include"smt_model_generator.h"
-#include"network_flow_def.h"
 #include"model_implicant.h"
 
 using namespace smt;
@@ -998,6 +997,10 @@ void theory_diff_logic<Ext>::get_implied_bound_antecedents(edge_id bridge_edge,
 
 template<typename Ext>
 inf_eps_rational<inf_rational> theory_diff_logic<Ext>::maximize(theory_var v) {
+
+#ifdef 0
+    // disabled until fixed.
+    
     objective_term const& objective = m_objectives[v];
 
     IF_VERBOSE(1,
@@ -1058,6 +1061,10 @@ inf_eps_rational<inf_rational> theory_diff_logic<Ext>::maximize(theory_var v) {
         IF_VERBOSE(1, verbose_stream() << "Unbounded objective" << std::endl;);
         return inf_eps_rational<inf_rational>::infinity();
     }
+
+#endif
+    return inf_eps_rational<inf_rational>::infinity();
+
 }
 
 template<typename Ext>