Enable non-linear solve by default, update regressions.

diff --git a/src/options/arith_options b/src/options/arith_options
index d90cdfa7b8dd1fb6d51f9bf79009cbb6e83f2df9..32310a4951d959d72e75f60c98d48f8033b2e1e2 100644 (file)
--- a/src/options/arith_options
+++ b/src/options/arith_options
@@ -165,7 +165,7 @@ option pbRewriteThreshold --pb-rewrite-threshold int :default 256
 option sNormInferEq --snorm-infer-eq bool :default false
  infer equalities based on Shostak normalization
 
-option nlExt --nl-ext bool :default false
+option nlExt --nl-ext bool :default true
  extended approach to non-linear
  
 option nlExtResBound --nl-ext-rbound bool :default false

diff --git a/test/regress/regress0/arith/bug547.2.smt2 b/test/regress/regress0/arith/bug547.2.smt2
index f39262c087c7aea45150e880409ad0777b6866a2..b7d114eb3336409131cb706265273a62a1e25012 100644 (file)
--- a/test/regress/regress0/arith/bug547.2.smt2
+++ b/test/regress/regress0/arith/bug547.2.smt2
@@ -1,5 +1,5 @@
 ; COMMAND-LINE: --rewrite-divk
-; EXPECT: unknown
+; EXPECT: sat
 (set-logic QF_NIA)
 (declare-fun x () Int)
 (declare-fun y () Int)

diff --git a/test/regress/regress0/arith/div.02.smt2 b/test/regress/regress0/arith/div.02.smt2
index 4ed27f8aef61464541224ec32def237b1406b383..328ed0cc6b93588bc5bf2a7ef3009ac30a166054 100644 (file)
--- a/test/regress/regress0/arith/div.02.smt2
+++ b/test/regress/regress0/arith/div.02.smt2
@@ -1,7 +1,7 @@
-; EXPECT: unknown
+; EXPECT: sat
 (set-logic QF_NIA)
 (set-info :smt-lib-version 2.0)
-(set-info :status unknown)
+(set-info :status sat)
 (declare-fun n () Int)
 
 (assert (distinct (div n n) 1))

diff --git a/test/regress/regress0/arith/div.03.smt2 b/test/regress/regress0/arith/div.03.smt2
index 0f67a3df193b2bd086139f36b0b27d4b7cd7f0ac..8beef7a69b20fdff8d06e63aa794730112a31c16 100644 (file)
--- a/test/regress/regress0/arith/div.03.smt2
+++ b/test/regress/regress0/arith/div.03.smt2
@@ -1,7 +1,7 @@
-; EXPECT: unknown
+; EXPECT: unsat
 (set-logic QF_NIA)
 (set-info :smt-lib-version 2.0)
-(set-info :status unknown)
+(set-info :status unsat)
 (declare-fun x () Int)
 (declare-fun n () Int)
 

diff --git a/test/regress/regress0/arith/div.05.smt2 b/test/regress/regress0/arith/div.05.smt2
index 9e4972e38065030830c71f2262e7e0414531eb14..fd3e4ae48d905d4d6c35b3ca3adeebdf3965461c 100644 (file)
--- a/test/regress/regress0/arith/div.05.smt2
+++ b/test/regress/regress0/arith/div.05.smt2
@@ -1,7 +1,7 @@
-; EXPECT: unknown
+; EXPECT: sat
 (set-logic QF_NRA)
 (set-info :smt-lib-version 2.0)
-(set-info :status unknown)
+(set-info :status sat)
 (declare-fun x () Real)
 (declare-fun y () Real)
 (declare-fun n () Real)

diff --git a/test/regress/regress0/arith/div.06.smt2 b/test/regress/regress0/arith/div.06.smt2
index 3fb4b124f97cb2bda9f8700f15e47d3050785c0d..6e72433ac30adaa842590e7685d5c7d223b6606c 100644 (file)
--- a/test/regress/regress0/arith/div.06.smt2
+++ b/test/regress/regress0/arith/div.06.smt2
@@ -1,7 +1,7 @@
-; EXPECT: unknown
+; EXPECT: sat
 (set-logic QF_NRA)
 (set-info :smt-lib-version 2.0)
-(set-info :status unknown)
+(set-info :status sat)
 (declare-fun x () Real)
 (declare-fun y () Real)
 (declare-fun n () Real)

diff --git a/test/regress/regress0/arith/mod.01.smt2 b/test/regress/regress0/arith/mod.01.smt2
index f9633c5972e786be27273cd4dd51bd969ffca948..3a6d9a3d33a0eef819710214ab29bcc78babdcec 100644 (file)
--- a/test/regress/regress0/arith/mod.01.smt2
+++ b/test/regress/regress0/arith/mod.01.smt2
@@ -1,7 +1,7 @@
-; EXPECT: unknown
+; EXPECT: sat
 (set-logic QF_NIA)
 (set-info :smt-lib-version 2.0)
-(set-info :status unknown)
+(set-info :status sat)
 (declare-fun n () Int)
 (declare-fun x () Int)
 

diff --git a/test/regress/regress0/arith/mod.02.smt2 b/test/regress/regress0/arith/mod.02.smt2
index c6281a5c29ba0fac672cd4c01b9d08af978977c4..ee4333ea5306d06a8c33f59abfdf1f64c0b4d10d 100644 (file)
--- a/test/regress/regress0/arith/mod.02.smt2
+++ b/test/regress/regress0/arith/mod.02.smt2
@@ -1,7 +1,7 @@
-; EXPECT: unknown
+; EXPECT: unsat
 (set-logic QF_NIA)
 (set-info :smt-lib-version 2.0)
-(set-info :status unknown)
+(set-info :status unsat)
 (declare-fun n () Int)
 
 (assert (distinct n 0))

diff --git a/test/regress/regress0/arith/mod.03.smt2 b/test/regress/regress0/arith/mod.03.smt2
index 110de05d7ec8b01a2a44a9ce4032a328eb2c248a..8a6ac51d7a74373f4650c30236a01f293ed487e7 100644 (file)
--- a/test/regress/regress0/arith/mod.03.smt2
+++ b/test/regress/regress0/arith/mod.03.smt2
@@ -1,7 +1,7 @@
-; EXPECT: unknown
+; EXPECT: sat
 (set-logic QF_NIA)
 (set-info :smt-lib-version 2.0)
-(set-info :status unknown)
+(set-info :status sat)
 (declare-fun n () Int)
 (declare-fun x () Int)
 

diff --git a/test/regress/regress0/arith/mult.01.smt2 b/test/regress/regress0/arith/mult.01.smt2
index f415e0f254019886811a5a3eb9aeafd1636fa1f1..4e2956d9dff3bf8e1b9f6fd709a79089870fa442 100644 (file)
--- a/test/regress/regress0/arith/mult.01.smt2
+++ b/test/regress/regress0/arith/mult.01.smt2
@@ -1,7 +1,7 @@
-; EXPECT: unknown
+; EXPECT: unsat
 (set-logic QF_NRA)
 (set-info :smt-lib-version 2.0)
-(set-info :status unknown)
+(set-info :status unsat)
 (declare-fun n () Real)
 (declare-fun x () Real)