merge from fmf-devel branch. more updates to models: now with collectModelInfo with fullModel argument, most theory-specific implementation out of the model class, model printer relegated to printer classes. Also updates to finite mode finding, modifications to datatypes making them compatible with theory combination, support for theory-specific handling of user attributes, refactoring of uf models

1 files changed, 8 insertions, 0 deletions

diff --git a/src/printer/printer.h b/src/printer/printer.h
index e3b1d6f40..6fedc854c 100644
--- a/src/printer/printer.h
+++ b/src/printer/printer.h
@@ -23,6 +23,7 @@
 
 #include "util/language.h"
 #include "util/sexpr.h"
+#include "util/model.h"
 #include "expr/node.h"
 #include "expr/command.h"
 
@@ -76,6 +77,13 @@ public:
    */
   virtual void toStream(std::ostream& out, const Result& r) const throw();
 
+  /** Write a Model out to a stream with this Printer. */
+  virtual void toStream(std::ostream& out, Model* m ) const throw();
+
+  //for models
+
+  /** write model response to command */
+  virtual void toStream(std::ostream& out, Model* m, Command* c, int c_type ) const throw() = 0;
 };/* class Printer */
 
 }/* CVC4 namespace */