remove cheap-eqs option as there is already propagate_eqs

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

scripts/nightly.yaml

@@ -14,7 +14,7 @@ stages:
     - script: git clone https://github.com/z3prover/z3test z3test
     - script: python z3test/scripts/test_benchmarks.py build-dist/z3 z3test/regressions/smt2    
     - script: cp dist/*.zip $(Build.ArtifactStagingDirectory)/.
-    - task: PublishPipelineArtifact@0
+    - task: PublishPipelineArtifact@2
       inputs:
         artifactName: 'Mac'
         targetPath: $(Build.ArtifactStagingDirectory)
@@ -175,19 +175,19 @@ stages:
     pool:
       vmImage: "ubuntu-latest"
     steps:
-    - task: DownloadPipelineArtifact@0
+    - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: 'Windows32'
         targetPath: $(Agent.TempDirectory)
-    - task: DownloadPipelineArtifact@0
+    - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: 'Windows64'
         targetPath: $(Agent.TempDirectory)
-    - task: DownloadPipelineArtifact@0
+    - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: 'Manylinux'
         targetPath: $(Agent.TempDirectory)
-    - task: DownloadPipelineArtifact@0
+    - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: 'Mac'
         targetPath: $(Agent.TempDirectory)
@@ -212,27 +212,27 @@ stages:
   - job: Deploy
     displayName: "Deploy into GitHub"
     steps:
-    - task: DownloadPipelineArtifact@0
+    - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: 'Windows32'
         targetPath: tmp
-    - task: DownloadPipelineArtifact@0
+    - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: 'Windows64'
         targetPath: tmp
-    - task: DownloadPipelineArtifact@0
+    - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: 'Mac'
         targetPath: tmp
-    - task: DownloadPipelineArtifact@0
+    - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: 'Ubuntu'
         targetPath: tmp
-    - task: DownloadPipelineArtifact@0
+    - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: 'Python packages'
         targetPath: tmp
-    - task: DownloadPipelineArtifact@0
+    - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: 'NuGet'
         targetPath: tmp

src/sat/smt/arith_solver.cpp

@@ -41,7 +41,7 @@ namespace arith {
         lp().set_track_pivoted_rows(lpar.arith_bprop_on_pivoted_rows());
         lp().settings().report_frequency = lpar.arith_rep_freq();
         lp().settings().print_statistics = lpar.arith_print_stats();
-        lp().settings().cheap_eqs() = lpar.arith_cheap_eqs();
+        lp().settings().cheap_eqs() = lpar.arith_propagate_eqs();
         lp().set_cut_strategy(get_config().m_arith_branch_cut_ratio);
         lp().settings().int_run_gcd_test() = get_config().m_arith_gcd_test;
         lp().settings().set_random_seed(get_config().m_random_seed);

src/smt/params/smt_params_helper.pyg

@@ -49,7 +49,6 @@ def_module_params(module_name='smt',
                           ('bv.watch_diseq', BOOL, False, 'use watch lists instead of eager axioms for bit-vectors'),
                           ('bv.delay', BOOL, True, 'delay internalize expensive bit-vector operations'),
                           ('arith.random_initial_value', BOOL, False, 'use random initial values in the simplex-based procedure for linear arithmetic'),
-                          ('arith.cheap_eqs', BOOL, True, 'false - do not run, true - run cheap equality heuristic'),
                           ('arith.solver', UINT, 6, 'arithmetic solver: 0 - no solver, 1 - bellman-ford based solver (diff. logic only), 2 - simplex based solver, 3 - floyd-warshall based solver (diff. logic only) and no theory combination 4 - utvpi, 5 - infinitary lra, 6 - lra solver'),
                           ('arith.nl', BOOL, True, '(incomplete) nonlinear arithmetic support based on Groebner basis and interval propagation, relevant only if smt.arith.solver=2'),
                           ('arith.nl.nra', BOOL, True, 'call nra_solver when incremental lianirization does not produce a lemma, this option is ignored when arith.nl=false, relevant only if smt.arith.solver=6'),

src/smt/theory_lra.cpp

@@ -884,7 +884,7 @@ public:
         lp().set_track_pivoted_rows(lpar.arith_bprop_on_pivoted_rows());
         lp().settings().report_frequency = lpar.arith_rep_freq();
         lp().settings().print_statistics = lpar.arith_print_stats();
-        lp().settings().cheap_eqs() = lpar.arith_cheap_eqs();
+        lp().settings().cheap_eqs() = lpar.arith_propagate_eqs();
 
         // todo : do not use m_arith_branch_cut_ratio for deciding on cheap cuts
         unsigned branch_cut_ratio = ctx().get_fparams().m_arith_branch_cut_ratio;