update managed APIs for lambda-based array models #2400

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
Z3Prover · Jul 13, 2019 · 2d4e9a0 · 2d4e9a0
1 parent 659be69
commit 2d4e9a0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/examples/dotnet/Program.cs b/examples/dotnet/Program.cs
@@ -363,10 +363,10 @@ static void ArrayExample1(Context ctx)
 
             Console.WriteLine("Model = " + s.Model);
 
-            //Console.WriteLine("Interpretation of MyArray:\n" + s.Model.ConstInterp(aex.FuncDecl));
+	    Console.WriteLine("Interpretation of MyArray:\n" + s.Model.ConstInterp(aex.FuncDecl));
             Console.WriteLine("Interpretation of x:\n" + s.Model.ConstInterp(xc));
             Console.WriteLine("Interpretation of f:\n" + s.Model.FuncInterp(fd));
-            //Console.WriteLine("Interpretation of MyArray as Term:\n" + s.Model.ConstInterp(aex.FuncDecl));
+            Console.WriteLine("Interpretation of MyArray as Term:\n" + s.Model.ConstInterp(aex.FuncDecl));
         }
 
         /// <summary>

diff --git a/src/api/dotnet/Model.cs b/src/api/dotnet/Model.cs
@@ -51,9 +51,8 @@ public Expr ConstInterp(FuncDecl f)
             Debug.Assert(f != null);
 
             Context.CheckContextMatch(f);
-            if (f.Arity != 0 ||
-                Native.Z3_get_sort_kind(Context.nCtx, Native.Z3_get_range(Context.nCtx, f.NativeObject)) == (uint)Z3_sort_kind.Z3_ARRAY_SORT)
-                throw new Z3Exception("Non-zero arity functions and arrays have FunctionInterpretations as a model. Use FuncInterp.");
+            if (f.Arity != 0) 
+                throw new Z3Exception("Non-zero arity functions have FunctionInterpretations as a model. Use FuncInterp.");
 
             IntPtr n = Native.Z3_model_get_const_interp(Context.nCtx, NativeObject, f.NativeObject);
             if (n == IntPtr.Zero)

diff --git a/src/api/java/Model.java b/src/api/java/Model.java
@@ -50,12 +50,9 @@ public Expr getConstInterp(Expr a)
     public Expr getConstInterp(FuncDecl f)
     {
         getContext().checkContextMatch(f);
-        if (f.getArity() != 0
-                || Native.getSortKind(getContext().nCtx(),
-                        Native.getRange(getContext().nCtx(), f.getNativeObject())) == Z3_sort_kind.Z3_ARRAY_SORT
-                        .toInt())
+        if (f.getArity() != 0)
             throw new Z3Exception(
-                    "Non-zero arity functions and arrays have FunctionInterpretations as a model. Use getFuncInterp.");
+                    "Non-zero arity functions have FunctionInterpretations as a model. Use getFuncInterp.");
 
         long n = Native.modelGetConstInterp(getContext().nCtx(), getNativeObject(),
                 f.getNativeObject());