From 69ce24a6ced29881b1b9d0292e28c082bc63c536 Mon Sep 17 00:00:00 2001 From: Leonardo de Moura Date: Wed, 24 Oct 2012 11:11:07 -0700 Subject: [PATCH] checkpoint Signed-off-by: Leonardo de Moura --- scripts/mk_make.py | 6 +++--- .../sat_strategy}/assertion_set2sat.cpp | 0 .../sat_strategy}/assertion_set2sat.h | 0 .../sat_strategy}/sat_solver_strategy.cpp | 0 .../sat_strategy}/sat_solver_strategy.h | 0 src/{nlsat/tactic => tactic/nlsat_tactic}/goal2nlsat.cpp | 0 src/{nlsat/tactic => tactic/nlsat_tactic}/goal2nlsat.h | 0 src/{nlsat/tactic => tactic/nlsat_tactic}/nlsat_tactic.cpp | 0 src/{nlsat/tactic => tactic/nlsat_tactic}/nlsat_tactic.h | 0 .../tactic => tactic/nlsat_tactic}/qfnra_nlsat_tactic.cpp | 0 .../tactic => tactic/nlsat_tactic}/qfnra_nlsat_tactic.h | 0 src/{sat/tactic => tactic/sat_tactic}/atom2bool_var.cpp | 0 src/{sat/tactic => tactic/sat_tactic}/atom2bool_var.h | 0 src/{sat/tactic => tactic/sat_tactic}/goal2sat.cpp | 0 src/{sat/tactic => tactic/sat_tactic}/goal2sat.h | 0 src/{sat/tactic => tactic/sat_tactic}/sat_tactic.cpp | 0 src/{sat/tactic => tactic/sat_tactic}/sat_tactic.h | 0 17 files changed, 3 insertions(+), 3 deletions(-) rename src/{sat/strategy => assertion_set/sat_strategy}/assertion_set2sat.cpp (100%) rename src/{sat/strategy => assertion_set/sat_strategy}/assertion_set2sat.h (100%) rename src/{sat/strategy => assertion_set/sat_strategy}/sat_solver_strategy.cpp (100%) rename src/{sat/strategy => assertion_set/sat_strategy}/sat_solver_strategy.h (100%) rename src/{nlsat/tactic => tactic/nlsat_tactic}/goal2nlsat.cpp (100%) rename src/{nlsat/tactic => tactic/nlsat_tactic}/goal2nlsat.h (100%) rename src/{nlsat/tactic => tactic/nlsat_tactic}/nlsat_tactic.cpp (100%) rename src/{nlsat/tactic => tactic/nlsat_tactic}/nlsat_tactic.h (100%) rename src/{nlsat/tactic => tactic/nlsat_tactic}/qfnra_nlsat_tactic.cpp (100%) rename src/{nlsat/tactic => tactic/nlsat_tactic}/qfnra_nlsat_tactic.h (100%) rename src/{sat/tactic => tactic/sat_tactic}/atom2bool_var.cpp (100%) rename src/{sat/tactic => tactic/sat_tactic}/atom2bool_var.h (100%) rename src/{sat/tactic => tactic/sat_tactic}/goal2sat.cpp (100%) rename src/{sat/tactic => tactic/sat_tactic}/goal2sat.h (100%) rename src/{sat/tactic => tactic/sat_tactic}/sat_tactic.cpp (100%) rename src/{sat/tactic => tactic/sat_tactic}/sat_tactic.h (100%) diff --git a/scripts/mk_make.py b/scripts/mk_make.py index 81f4d848f..c61d43573 100644 --- a/scripts/mk_make.py +++ b/scripts/mk_make.py @@ -55,10 +55,10 @@ add_lib('smt', ['assertion_set', 'bit_blaster', 'macros', 'normal_forms', 'cmd_c 'substitution', 'grobner', 'euclid', 'proof_checker', 'pattern', 'parser_util']) add_lib('user_plugin', ['smt'], 'smt/user_plugin') add_lib('core_tactics', ['tactic', 'normal_forms'], 'tactic/core_tactics') -add_lib('sat_tactic', ['tactic', 'sat'], 'sat/tactic') -add_lib('sat_strategy', ['assertion_set', 'sat_tactic'], 'sat/strategy') +add_lib('sat_tactic', ['tactic', 'sat'], 'tactic/sat_tactic') +add_lib('sat_strategy', ['assertion_set', 'sat_tactic'], 'assertion_set/sat_strategy') add_lib('arith_tactics', ['core_tactics', 'assertion_set', 'sat', 'sat_strategy'], 'tactic/arith_tactics') -add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'nlsat/tactic') +add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'tactic/nlsat_tactic') add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'math/subpaving/tactic') add_lib('bv_tactics', ['tactic', 'bit_blaster'], 'tactic/bv_tactics') add_lib('fuzzing', ['ast'], 'test/fuzzing') diff --git a/src/sat/strategy/assertion_set2sat.cpp b/src/assertion_set/sat_strategy/assertion_set2sat.cpp similarity index 100% rename from src/sat/strategy/assertion_set2sat.cpp rename to src/assertion_set/sat_strategy/assertion_set2sat.cpp diff --git a/src/sat/strategy/assertion_set2sat.h b/src/assertion_set/sat_strategy/assertion_set2sat.h similarity index 100% rename from src/sat/strategy/assertion_set2sat.h rename to src/assertion_set/sat_strategy/assertion_set2sat.h diff --git a/src/sat/strategy/sat_solver_strategy.cpp b/src/assertion_set/sat_strategy/sat_solver_strategy.cpp similarity index 100% rename from src/sat/strategy/sat_solver_strategy.cpp rename to src/assertion_set/sat_strategy/sat_solver_strategy.cpp diff --git a/src/sat/strategy/sat_solver_strategy.h b/src/assertion_set/sat_strategy/sat_solver_strategy.h similarity index 100% rename from src/sat/strategy/sat_solver_strategy.h rename to src/assertion_set/sat_strategy/sat_solver_strategy.h diff --git a/src/nlsat/tactic/goal2nlsat.cpp b/src/tactic/nlsat_tactic/goal2nlsat.cpp similarity index 100% rename from src/nlsat/tactic/goal2nlsat.cpp rename to src/tactic/nlsat_tactic/goal2nlsat.cpp diff --git a/src/nlsat/tactic/goal2nlsat.h b/src/tactic/nlsat_tactic/goal2nlsat.h similarity index 100% rename from src/nlsat/tactic/goal2nlsat.h rename to src/tactic/nlsat_tactic/goal2nlsat.h diff --git a/src/nlsat/tactic/nlsat_tactic.cpp b/src/tactic/nlsat_tactic/nlsat_tactic.cpp similarity index 100% rename from src/nlsat/tactic/nlsat_tactic.cpp rename to src/tactic/nlsat_tactic/nlsat_tactic.cpp diff --git a/src/nlsat/tactic/nlsat_tactic.h b/src/tactic/nlsat_tactic/nlsat_tactic.h similarity index 100% rename from src/nlsat/tactic/nlsat_tactic.h rename to src/tactic/nlsat_tactic/nlsat_tactic.h diff --git a/src/nlsat/tactic/qfnra_nlsat_tactic.cpp b/src/tactic/nlsat_tactic/qfnra_nlsat_tactic.cpp similarity index 100% rename from src/nlsat/tactic/qfnra_nlsat_tactic.cpp rename to src/tactic/nlsat_tactic/qfnra_nlsat_tactic.cpp diff --git a/src/nlsat/tactic/qfnra_nlsat_tactic.h b/src/tactic/nlsat_tactic/qfnra_nlsat_tactic.h similarity index 100% rename from src/nlsat/tactic/qfnra_nlsat_tactic.h rename to src/tactic/nlsat_tactic/qfnra_nlsat_tactic.h diff --git a/src/sat/tactic/atom2bool_var.cpp b/src/tactic/sat_tactic/atom2bool_var.cpp similarity index 100% rename from src/sat/tactic/atom2bool_var.cpp rename to src/tactic/sat_tactic/atom2bool_var.cpp diff --git a/src/sat/tactic/atom2bool_var.h b/src/tactic/sat_tactic/atom2bool_var.h similarity index 100% rename from src/sat/tactic/atom2bool_var.h rename to src/tactic/sat_tactic/atom2bool_var.h diff --git a/src/sat/tactic/goal2sat.cpp b/src/tactic/sat_tactic/goal2sat.cpp similarity index 100% rename from src/sat/tactic/goal2sat.cpp rename to src/tactic/sat_tactic/goal2sat.cpp diff --git a/src/sat/tactic/goal2sat.h b/src/tactic/sat_tactic/goal2sat.h similarity index 100% rename from src/sat/tactic/goal2sat.h rename to src/tactic/sat_tactic/goal2sat.h diff --git a/src/sat/tactic/sat_tactic.cpp b/src/tactic/sat_tactic/sat_tactic.cpp similarity index 100% rename from src/sat/tactic/sat_tactic.cpp rename to src/tactic/sat_tactic/sat_tactic.cpp diff --git a/src/sat/tactic/sat_tactic.h b/src/tactic/sat_tactic/sat_tactic.h similarity index 100% rename from src/sat/tactic/sat_tactic.h rename to src/tactic/sat_tactic/sat_tactic.h