From ae1d4e4f05fdc2db61d7de7efee5bd567363ceef Mon Sep 17 00:00:00 2001 From: ajreynol Date: Wed, 28 Jun 2017 13:37:18 -0500 Subject: [PATCH] Enable non-linear solve by default, update regressions. --- src/options/arith_options | 2 +- test/regress/regress0/arith/bug547.2.smt2 | 2 +- test/regress/regress0/arith/div.02.smt2 | 4 ++-- test/regress/regress0/arith/div.03.smt2 | 4 ++-- test/regress/regress0/arith/div.05.smt2 | 4 ++-- test/regress/regress0/arith/div.06.smt2 | 4 ++-- test/regress/regress0/arith/mod.01.smt2 | 4 ++-- test/regress/regress0/arith/mod.02.smt2 | 4 ++-- test/regress/regress0/arith/mod.03.smt2 | 4 ++-- test/regress/regress0/arith/mult.01.smt2 | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/options/arith_options b/src/options/arith_options index d90cdfa7b..32310a495 100644 --- 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 f39262c08..b7d114eb3 100644 --- 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 4ed27f8ae..328ed0cc6 100644 --- 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 0f67a3df1..8beef7a69 100644 --- 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 9e4972e38..fd3e4ae48 100644 --- 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 3fb4b124f..6e72433ac 100644 --- 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 f9633c597..3a6d9a3d3 100644 --- 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 c6281a5c2..ee4333ea5 100644 --- 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 110de05d7..8a6ac51d7 100644 --- 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 f415e0f25..4e2956d9d 100644 --- 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) -- 2.30.2