From 129e2f5e238daf2bb37d2e1e9dcc425a741fbf75 Mon Sep 17 00:00:00 2001
From: "Christoph M. Wintersteiger" <cwinter@microsoft.com>
Date: Wed, 11 Jun 2014 17:55:31 +0100
Subject: [PATCH] FPA API fixes and examples

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
---
 examples/c/test_capi.c    | 55 +++++++++++++++++++++++++++------------
 src/api/dotnet/Context.cs |  2 +-
 src/api/z3_fpa.h          |  2 +-
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/examples/c/test_capi.c b/examples/c/test_capi.c
index 4363ee382..578c563b7 100644
--- a/examples/c/test_capi.c
+++ b/examples/c/test_capi.c
@@ -2604,29 +2604,49 @@ void fpa_example() {
 
     printf("\nFPA-example\n");
     LOG_MSG("FPA-example");
-    
-    enable_trace("fpa");
 
-    cfg                = Z3_mk_config();
-    ctx                = Z3_mk_context(cfg);
+    cfg = Z3_mk_config();
+    ctx = Z3_mk_context(cfg);
     Z3_del_config(cfg);
 
-    double_sort        = Z3_mk_fpa_sort(ctx, 11, 53);
-    rm_sort            = Z3_mk_fpa_rounding_mode_sort(ctx);
+    double_sort = Z3_mk_fpa_sort(ctx, 11, 53);
+    rm_sort = Z3_mk_fpa_rounding_mode_sort(ctx);
 
-    symbol_rm          = Z3_mk_string_symbol(ctx, "rm");
-    rm                 = Z3_mk_const(ctx, symbol_rm, rm_sort);
-    symbol_x           = Z3_mk_string_symbol(ctx, "x");
-    symbol_y           = Z3_mk_string_symbol(ctx, "y");
-    x                  = Z3_mk_const(ctx, symbol_x, double_sort);
-    y                  = Z3_mk_const(ctx, symbol_y, double_sort);   
-    n                  = Z3_mk_double(ctx, 42.0, double_sort);
+    symbol_rm = Z3_mk_string_symbol(ctx, "rm");
+    rm = Z3_mk_const(ctx, symbol_rm, rm_sort);
+    symbol_x = Z3_mk_string_symbol(ctx, "x");
+    symbol_y = Z3_mk_string_symbol(ctx, "y");
+    x = Z3_mk_const(ctx, symbol_x, double_sort);
+    y = Z3_mk_const(ctx, symbol_y, double_sort);
+    n = Z3_mk_fpa_double(ctx, 42.0, double_sort);
+
+    Z3_symbol q_s = Z3_mk_string_symbol(ctx, "q");
+    Z3_ast q = Z3_mk_const(ctx, q_s, double_sort);
+    c = Z3_mk_eq(ctx, q, Z3_mk_fpa_add(ctx, rm, x, y));
+
+    Z3_ast args[2] = { c, Z3_mk_eq(ctx, q, n) };
+    c = Z3_mk_and(ctx, 2, (Z3_ast*)&args);
+
+    printf("c = %s\n", Z3_ast_to_string(ctx, c));
 
-    c                  = Z3_mk_eq(ctx, Z3_mk_fpa_add(ctx, rm, x, y), n);
-    
     Z3_assert_cnstr(ctx, c);
-    if (Z3_check(ctx) != Z3_L_TRUE)
-        printf("FPA-example not satisfied!\n");
+
+    Z3_model m = 0;
+    Z3_lbool result = Z3_check_and_get_model(ctx, &m);
+    switch (result) {
+    case Z3_L_FALSE:
+        printf("unsat\n");
+        break;
+    case Z3_L_UNDEF:
+        printf("unknown\n");
+        break;
+    case Z3_L_TRUE:
+        printf("sat\n%s\n", Z3_model_to_string(ctx, m));        
+        break;
+    }
+
+    if (m)
+        Z3_del_model(ctx, m);
 
     Z3_del_context(ctx);
 }
@@ -2676,5 +2696,6 @@ int main() {
     smt2parser_example();
     substitute_example();
     substitute_vars_example();
+    fpa_example();
     return 0;
 }
diff --git a/src/api/dotnet/Context.cs b/src/api/dotnet/Context.cs
index b654feb7e..e60c93fba 100644
--- a/src/api/dotnet/Context.cs
+++ b/src/api/dotnet/Context.cs
@@ -3533,7 +3533,7 @@ namespace Microsoft.Z3
         public FPNum MkFP(double v, FPSort s)
         {
             Contract.Ensures(Contract.Result<FPNum>() != null);
-            return new FPNum(this, Native.Z3_mk_double(this.nCtx, v, s.NativeObject));
+            return new FPNum(this, Native.Z3_mk_fpa_double(this.nCtx, v, s.NativeObject));
         }    
 
         /// <summary>
diff --git a/src/api/z3_fpa.h b/src/api/z3_fpa.h
index 81cfff591..93cfb8dd5 100644
--- a/src/api/z3_fpa.h
+++ b/src/api/z3_fpa.h
@@ -129,7 +129,7 @@ extern "C" {
 
        \sa Z3_mk_numeral
 
-       def_API('Z3_mk_double', AST, (_in(CONTEXT), _in(DOUBLE), _in(SORT)))
+       def_API('Z3_mk_fpa_double', AST, (_in(CONTEXT), _in(DOUBLE), _in(SORT)))
     */
     Z3_ast Z3_API Z3_mk_fpa_double(__in Z3_context c, __in double v, __in Z3_sort ty);