update license for space/quotes per Z3Prover#982

Signed-off-by: Nikolaj Bjorner <[email protected]>

Author: NikolajBjorner

LICENSE.txt

@@ -2,6 +2,9 @@ Z3
 Copyright (c) Microsoft Corporation
 All rights reserved. 
 MIT License
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/interp/iz3proof_itp.cpp

@@ -541,6 +541,7 @@ class iz3proof_itp_impl : public iz3proof_itp {
                 placeholder_arg |= is_placeholder(args[i]);
             }
             try {
+                TRACE("duality", print_expr(tout, e); tout << "\n";);
                 opr f = op(e);
                 if(f == Equal && args[0] == args[1]) res = mk_true();
                 else if(f == And) res = my_and(args);
@@ -853,6 +854,7 @@ class iz3proof_itp_impl : public iz3proof_itp {
 
     ast simplify_rotate_eq2leq(const ast &pl, const ast &neg_equality, const ast &pf){
         if(pl == arg(pf,1)){
+            TRACE("duality", print_expr(tout, pl); print_expr(tout << "\n", neg_equality); print_expr(tout << "\n", pf); tout << "\n";);
             ast cond = mk_true();
             ast equa = sep_cond(arg(pf,0),cond);
             if(is_equivrel_chain(equa)){
@@ -1870,10 +1872,13 @@ class iz3proof_itp_impl : public iz3proof_itp {
 
     ast chain_ineqs(opr comp_op, LitType t, const ast &chain, const ast &lhs, const ast &rhs){
         if(is_true(chain)){
-            if(lhs != rhs)
+            if (lhs != rhs) {
+                TRACE("duality", print_expr(tout, lhs); tout << " "; print_expr(tout, rhs); tout << "\n";);
                 throw bad_ineq_inference();
+            }
             return make(Leq,make_int(rational(0)),make_int(rational(0)));
         }
+        TRACE("duality", print_expr(tout, chain); print_expr(tout << "\n", lhs); tout << " "; print_expr(tout, rhs); tout << "\n";);
         ast last = chain_last(chain);
         ast rest = chain_rest(chain);
         ast mid = subst_in_pos(rhs,rewrite_pos(last),rewrite_lhs(last));

src/sat/sat_solver.cpp

@@ -3324,7 +3324,7 @@ namespace sat {
             if (is_sat == l_true) {
                 delete_unfixed(unfixed_lits, unfixed_vars);
             }
-            extract_fixed_consequences(num_units, assumptions, unfixed_vars, conseq);
+            extract_fixed_consequences(num_units, assumptions, unfixed_vars, conseq); 
             update_unfixed_literals(unfixed_lits, unfixed_vars);
             IF_VERBOSE(1, verbose_stream() << "(sat.get-consequences"
                        << " iterations: " << num_iterations