Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt

Conflicts:
	scripts/mk_project.py
	src/duality/duality.h
	src/duality/duality_solver.cpp
	src/duality/duality_wrapper.h
	src/interp/iz3hash.h

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>

src/duality/duality_profiling.cpp

@@ -1,134 +1,134 @@
-/*++
-Copyright (c) 2011 Microsoft Corporation
-
-Module Name:
-
-    duality_profiling.cpp
-
-Abstract:
-
-   collection performance information for duality
-
-Author:
-
-    Ken McMillan (kenmcmil)
-
-Revision History:
-
-
---*/
-
-
-#include <map>
-#include <iostream>
-#include <string>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef _WINDOWS
-#pragma warning(disable:4996)
-#pragma warning(disable:4800)
-#pragma warning(disable:4267)
-#endif
-
-#include "duality_wrapper.h"
-#include "iz3profiling.h"
-
-namespace Duality {
-  
-  void show_time(){
-    output_time(std::cout,current_time());
-    std::cout << "\n";
-  }
-
-  typedef std::map<const char*, struct node> nmap;
-  
-  struct node {
-    std::string name;
-    clock_t time;
-    clock_t start_time;
-    nmap sub;
-    struct node *parent;
-    
-    node();
-  } top;
-  
-  node::node(){
-    time =  0;
-    parent = 0;
-  }
-  
-  struct node *current;
-  
-  struct init {
-    init(){
-      top.name = "TOTAL";
-      current = &top;
-    }
-  } initializer;
-  
-  struct time_entry {
-    clock_t t;
-    time_entry(){t = 0;};
-    void add(clock_t incr){t += incr;}
-  };
-  
-  struct ltstr
-  {
-    bool operator()(const char* s1, const char* s2) const
-    {
-      return strcmp(s1, s2) < 0;
-    }
-  };
-  
-  typedef  std::map<const char*, time_entry, ltstr> tmap;
-
-  static std::ostream *pfs;
-
-  void print_node(node &top, int indent, tmap &totals){
-    for(int i = 0; i < indent; i++) (*pfs) << "  ";
-    (*pfs) << top.name;
-    int dots = 70 - 2 * indent - top.name.size();
-    for(int i = 0; i <dots; i++) (*pfs) << ".";
-    output_time(*pfs, top.time);
-    (*pfs) << std::endl;
-    if(indent != 0)totals[top.name.c_str()].add(top.time);
-    for(nmap::iterator it = top.sub.begin(); it != top.sub.end(); it++)
-      print_node(it->second,indent+1,totals);
-  }
-  
-  void print_profile(std::ostream &os) {
-    pfs = &os;
-    top.time = 0;
-    for(nmap::iterator it = top.sub.begin(); it != top.sub.end(); it++)
-      top.time += it->second.time;
-    tmap totals;
-    print_node(top,0,totals);
-    (*pfs) << "TOTALS:" << std::endl;
-    for(tmap::iterator it = totals.begin(); it != totals.end(); it++){
-      (*pfs) << (it->first) << " ";
-      output_time(*pfs, it->second.t);
-      (*pfs) << std::endl;
-    }
-    profiling::print(os); // print the interpolation stats
-  }
-  
-  void timer_start(const char *name){
-    node &child = current->sub[name];
-    if(child.name.empty()){ // a new node
-      child.parent = current;
-      child.name = name;
-    }
-    child.start_time = current_time();
-    current = &child;
-  }
-
-  void timer_stop(const char *name){
-    if(current->name != name || !current->parent){
-      std::cerr << "imbalanced timer_start and timer_stop";
-      exit(1);
-    }
-    current->time += (current_time() - current->start_time);
-    current = current->parent;
-  }
-}
+/*++
+Copyright (c) 2011 Microsoft Corporation
+
+Module Name:
+
+    duality_profiling.cpp
+
+Abstract:
+
+   collection performance information for duality
+
+Author:
+
+    Ken McMillan (kenmcmil)
+
+Revision History:
+
+
+--*/
+
+
+#include <map>
+#include <iostream>
+#include <string>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef _WINDOWS
+#pragma warning(disable:4996)
+#pragma warning(disable:4800)
+#pragma warning(disable:4267)
+#endif
+
+#include "duality_wrapper.h"
+#include "iz3profiling.h"
+
+namespace Duality {
+  
+  void show_time(){
+    output_time(std::cout,current_time());
+    std::cout << "\n";
+  }
+
+  typedef std::map<const char*, struct node> nmap;
+  
+  struct node {
+    std::string name;
+    clock_t time;
+    clock_t start_time;
+    nmap sub;
+    struct node *parent;
+    
+    node();
+  } top;
+  
+  node::node(){
+    time =  0;
+    parent = 0;
+  }
+  
+  struct node *current;
+  
+  struct init {
+    init(){
+      top.name = "TOTAL";
+      current = &top;
+    }
+  } initializer;
+  
+  struct time_entry {
+    clock_t t;
+    time_entry(){t = 0;};
+    void add(clock_t incr){t += incr;}
+  };
+  
+  struct ltstr
+  {
+    bool operator()(const char* s1, const char* s2) const
+    {
+      return strcmp(s1, s2) < 0;
+    }
+  };
+  
+  typedef  std::map<const char*, time_entry, ltstr> tmap;
+
+  static std::ostream *pfs;
+
+  void print_node(node &top, int indent, tmap &totals){
+    for(int i = 0; i < indent; i++) (*pfs) << "  ";
+    (*pfs) << top.name;
+    int dots = 70 - 2 * indent - top.name.size();
+    for(int i = 0; i <dots; i++) (*pfs) << ".";
+    output_time(*pfs, top.time);
+    (*pfs) << std::endl;
+    if(indent != 0)totals[top.name.c_str()].add(top.time);
+    for(nmap::iterator it = top.sub.begin(); it != top.sub.end(); it++)
+      print_node(it->second,indent+1,totals);
+  }
+  
+  void print_profile(std::ostream &os) {
+    pfs = &os;
+    top.time = 0;
+    for(nmap::iterator it = top.sub.begin(); it != top.sub.end(); it++)
+      top.time += it->second.time;
+    tmap totals;
+    print_node(top,0,totals);
+    (*pfs) << "TOTALS:" << std::endl;
+    for(tmap::iterator it = totals.begin(); it != totals.end(); it++){
+      (*pfs) << (it->first) << " ";
+      output_time(*pfs, it->second.t);
+      (*pfs) << std::endl;
+    }
+    profiling::print(os); // print the interpolation stats
+  }
+  
+  void timer_start(const char *name){
+    node &child = current->sub[name];
+    if(child.name.empty()){ // a new node
+      child.parent = current;
+      child.name = name;
+    }
+    child.start_time = current_time();
+    current = &child;
+  }
+
+  void timer_stop(const char *name){
+    if(current->name != name || !current->parent){
+      std::cerr << "imbalanced timer_start and timer_stop";
+      exit(1);
+    }
+    current->time += (current_time() - current->start_time);
+    current = current->parent;
+  }
+}

src/duality/duality_profiling.h

@@ -1,38 +1,38 @@
-/*++
-Copyright (c) 2011 Microsoft Corporation
-
-Module Name:
-
-    duality_profiling.h
-
-Abstract:
-
-   collection performance information for duality
-
-Author:
-
-    Ken McMillan (kenmcmil)
-
-Revision History:
-
-
---*/
-
-#ifndef DUALITYPROFILING_H
-#define DUALITYPROFILING_H
-
-#include <ostream>
-
-namespace Duality {
-  /** Start a timer with given name */
-  void timer_start(const char *);
-  /** Stop a timer with given name */
-  void timer_stop(const char *);
-  /** Print out timings */
-  void print_profile(std::ostream &s);
-  /** Show the current time. */
-  void show_time();
-}
-
-#endif
-
+/*++
+Copyright (c) 2011 Microsoft Corporation
+
+Module Name:
+
+    duality_profiling.h
+
+Abstract:
+
+   collection performance information for duality
+
+Author:
+
+    Ken McMillan (kenmcmil)
+
+Revision History:
+
+
+--*/
+
+#ifndef DUALITYPROFILING_H
+#define DUALITYPROFILING_H
+
+#include <ostream>
+
+namespace Duality {
+  /** Start a timer with given name */
+  void timer_start(const char *);
+  /** Stop a timer with given name */
+  void timer_stop(const char *);
+  /** Print out timings */
+  void print_profile(std::ostream &s);
+  /** Show the current time. */
+  void show_time();
+}
+
+#endif
+

src/duality/duality_wrapper.cpp

@@ -340,6 +340,12 @@ expr context::make_quant(decl_kind op, const std::vector<sort> &_sorts, const st
     params p;
     return simplify(p);
   }
+  
+  expr context::make_var(int idx, const sort &s){
+    ::sort * a = to_sort(s.raw());
+    return cook(m().mk_var(idx,a));
+  }
+
 
   expr expr::qe_lite() const {
     ::qe_lite qe(m());
@@ -374,6 +380,12 @@ expr context::make_quant(decl_kind op, const std::vector<sort> &_sorts, const st
     return q.ctx().cook(q.m().update_quantifier(thing, is_forall, num_patterns, &_patterns[0], to_expr(b.raw())));
   }
 
+  expr clone_quantifier(decl_kind dk, const expr &q, const expr &b){
+    quantifier *thing = to_quantifier(q.raw());
+    bool is_forall = dk == Forall;
+    return q.ctx().cook(q.m().update_quantifier(thing, is_forall, to_expr(b.raw())));
+  }
+
   void expr::get_patterns(std::vector<expr> &pats) const {
     quantifier *thing = to_quantifier(raw());
     unsigned num_patterns = thing->get_num_patterns();