merge

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/api/java/Optimize.java

@@ -298,6 +298,24 @@ public class Optimize extends Z3Object {
         return Native.optimizeToString(getContext().nCtx(), getNativeObject());
     }
 
+    /**
+     * Parse an SMT-LIB2 file with optimization objectives and constraints.
+     * The parsed constraints and objectives are added to the optimization context.
+     */
+    public void fromFile(String file)
+    {
+	Native.optimizeFromFile(getContext().nCtx(), getNativeObject(), file);
+    }
+
+    /**
+     * Similar to FromFile. Instead it takes as argument a string.
+     */
+    public void fromString(String s)
+    {
+	Native.optimizeFromString(getContext().nCtx(), getNativeObject(), s);
+    }
+
+
     /**
      *  Optimize statistics.
      **/

src/smt/mam.cpp

@@ -2087,9 +2087,9 @@ namespace smt {
         for (; it != end; ++it) {
             enode * p = *it;
             if (p->get_decl() == f  && 
-                p->get_num_args() == num_args && 
                 m_context.is_relevant(p)  &&
                 p->is_cgr() &&
+                i < p->get_num_args() &&
                 p->get_arg(i)->get_root() == n) {
                 v->push_back(p);
             }