src/ZF/int_arith.ML
author wenzelm
Thu, 23 Jul 2009 18:44:09 +0200
changeset 32149 ef59550a55d3
parent 30607 c3d1590debd8
child 32155 e2bf2f73b0c8
permissions -rw-r--r--
renamed simpset_of to global_simpset_of, and local_simpset_of to simpset_of -- same for claset and clasimpset;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
     1
(*  Title:      ZF/int_arith.ML
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
     2
    Author:     Larry Paulson
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
     3
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
     4
Simprocs for linear arithmetic.
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
     5
*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
     6
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
     7
structure Int_Numeral_Simprocs =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
     8
struct
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
     9
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    10
(*Utilities*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    11
27237
c94eefffc3a5 converted ML proofs;
wenzelm
parents: 27154
diff changeset
    12
fun mk_numeral n = @{const integ_of} $ NumeralSyntax.mk_bin n;
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    13
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    14
(*Decodes a binary INTEGER*)
27237
c94eefffc3a5 converted ML proofs;
wenzelm
parents: 27154
diff changeset
    15
fun dest_numeral (Const(@{const_name integ_of}, _) $ w) =
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    16
     (NumeralSyntax.dest_bin w
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    17
      handle Match => raise TERM("Int_Numeral_Simprocs.dest_numeral:1", [w]))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    18
  | dest_numeral t =  raise TERM("Int_Numeral_Simprocs.dest_numeral:2", [t]);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    19
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    20
fun find_first_numeral past (t::terms) =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    21
        ((dest_numeral t, rev past @ terms)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    22
         handle TERM _ => find_first_numeral (t::past) terms)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    23
  | find_first_numeral past [] = raise TERM("find_first_numeral", []);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    24
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    25
val zero = mk_numeral 0;
26059
b67a225b50fd removed unnecessary theory qualifiers;
wenzelm
parents: 26056
diff changeset
    26
val mk_plus = FOLogic.mk_binop @{const_name "zadd"};
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    27
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    28
(*Thus mk_sum[t] yields t+#0; longer sums don't have a trailing zero*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    29
fun mk_sum []        = zero
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    30
  | mk_sum [t,u]     = mk_plus (t, u)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    31
  | mk_sum (t :: ts) = mk_plus (t, mk_sum ts);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    32
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    33
(*this version ALWAYS includes a trailing zero*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    34
fun long_mk_sum []        = zero
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    35
  | long_mk_sum (t :: ts) = mk_plus (t, mk_sum ts);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    36
26190
cf51a23c0cd0 tuned ML code, more antiquotations;
wenzelm
parents: 26059
diff changeset
    37
val dest_plus = FOLogic.dest_bin @{const_name "zadd"} @{typ i};
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    38
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    39
(*decompose additions AND subtractions as a sum*)
26059
b67a225b50fd removed unnecessary theory qualifiers;
wenzelm
parents: 26056
diff changeset
    40
fun dest_summing (pos, Const (@{const_name "zadd"}, _) $ t $ u, ts) =
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    41
        dest_summing (pos, t, dest_summing (pos, u, ts))
26059
b67a225b50fd removed unnecessary theory qualifiers;
wenzelm
parents: 26056
diff changeset
    42
  | dest_summing (pos, Const (@{const_name "zdiff"}, _) $ t $ u, ts) =
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    43
        dest_summing (pos, t, dest_summing (not pos, u, ts))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    44
  | dest_summing (pos, t, ts) =
27237
c94eefffc3a5 converted ML proofs;
wenzelm
parents: 27154
diff changeset
    45
        if pos then t::ts else @{const zminus} $ t :: ts;
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    46
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    47
fun dest_sum t = dest_summing (true, t, []);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    48
26059
b67a225b50fd removed unnecessary theory qualifiers;
wenzelm
parents: 26056
diff changeset
    49
val mk_diff = FOLogic.mk_binop @{const_name "zdiff"};
26190
cf51a23c0cd0 tuned ML code, more antiquotations;
wenzelm
parents: 26059
diff changeset
    50
val dest_diff = FOLogic.dest_bin @{const_name "zdiff"} @{typ i};
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    51
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    52
val one = mk_numeral 1;
26059
b67a225b50fd removed unnecessary theory qualifiers;
wenzelm
parents: 26056
diff changeset
    53
val mk_times = FOLogic.mk_binop @{const_name "zmult"};
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    54
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    55
fun mk_prod [] = one
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    56
  | mk_prod [t] = t
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    57
  | mk_prod (t :: ts) = if t = one then mk_prod ts
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    58
                        else mk_times (t, mk_prod ts);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    59
26190
cf51a23c0cd0 tuned ML code, more antiquotations;
wenzelm
parents: 26059
diff changeset
    60
val dest_times = FOLogic.dest_bin @{const_name "zmult"} @{typ i};
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    61
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    62
fun dest_prod t =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    63
      let val (t,u) = dest_times t
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    64
      in  dest_prod t @ dest_prod u  end
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    65
      handle TERM _ => [t];
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    66
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    67
(*DON'T do the obvious simplifications; that would create special cases*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    68
fun mk_coeff (k, t) = mk_times (mk_numeral k, t);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    69
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    70
(*Express t as a product of (possibly) a numeral with other sorted terms*)
26059
b67a225b50fd removed unnecessary theory qualifiers;
wenzelm
parents: 26056
diff changeset
    71
fun dest_coeff sign (Const (@{const_name "zminus"}, _) $ t) = dest_coeff (~sign) t
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    72
  | dest_coeff sign t =
29269
5c25a2012975 moved term order operations to structure TermOrd (cf. Pure/term_ord.ML);
wenzelm
parents: 27237
diff changeset
    73
    let val ts = sort TermOrd.term_ord (dest_prod t)
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    74
        val (n, ts') = find_first_numeral [] ts
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    75
                          handle TERM _ => (1, ts)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    76
    in (sign*n, mk_prod ts') end;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    77
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    78
(*Find first coefficient-term THAT MATCHES u*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    79
fun find_first_coeff past u [] = raise TERM("find_first_coeff", [])
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    80
  | find_first_coeff past u (t::terms) =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    81
        let val (n,u') = dest_coeff 1 t
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    82
        in  if u aconv u' then (n, rev past @ terms)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    83
                          else find_first_coeff (t::past) u terms
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    84
        end
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    85
        handle TERM _ => find_first_coeff (t::past) u terms;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    86
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    87
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    88
(*Simplify #1*n and n*#1 to n*)
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
    89
val add_0s = [@{thm zadd_0_intify}, @{thm zadd_0_right_intify}];
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    90
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
    91
val mult_1s = [@{thm zmult_1_intify}, @{thm zmult_1_right_intify},
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
    92
               @{thm zmult_minus1}, @{thm zmult_minus1_right}];
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
    93
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
    94
val tc_rules = [@{thm integ_of_type}, @{thm intify_in_int},
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
    95
                @{thm int_of_type}, @{thm zadd_type}, @{thm zdiff_type}, @{thm zmult_type}] @ 
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
    96
               @{thms bin.intros};
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
    97
val intifys = [@{thm intify_ident}, @{thm zadd_intify1}, @{thm zadd_intify2},
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
    98
               @{thm zdiff_intify1}, @{thm zdiff_intify2}, @{thm zmult_intify1}, @{thm zmult_intify2},
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
    99
               @{thm zless_intify1}, @{thm zless_intify2}, @{thm zle_intify1}, @{thm zle_intify2}];
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   100
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   101
(*To perform binary arithmetic*)
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   102
val bin_simps = [@{thm add_integ_of_left}] @ @{thms bin_arith_simps} @ @{thms bin_rel_simps};
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   103
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   104
(*To evaluate binary negations of coefficients*)
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   105
val zminus_simps = @{thms NCons_simps} @
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   106
                   [@{thm integ_of_minus} RS sym,
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   107
                    @{thm bin_minus_1}, @{thm bin_minus_0}, @{thm bin_minus_Pls}, @{thm bin_minus_Min},
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   108
                    @{thm bin_pred_1}, @{thm bin_pred_0}, @{thm bin_pred_Pls}, @{thm bin_pred_Min}];
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   109
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   110
(*To let us treat subtraction as addition*)
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   111
val diff_simps = [@{thm zdiff_def}, @{thm zminus_zadd_distrib}, @{thm zminus_zminus}];
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   112
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   113
(*push the unary minus down: - x * y = x * - y *)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   114
val int_minus_mult_eq_1_to_2 =
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   115
    [@{thm zmult_zminus}, @{thm zmult_zminus_right} RS sym] MRS trans |> standard;
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   116
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   117
(*to extract again any uncancelled minuses*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   118
val int_minus_from_mult_simps =
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   119
    [@{thm zminus_zminus}, @{thm zmult_zminus}, @{thm zmult_zminus_right}];
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   120
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   121
(*combine unary minus with numeric literals, however nested within a product*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   122
val int_mult_minus_simps =
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   123
    [@{thm zmult_assoc}, @{thm zmult_zminus} RS sym, int_minus_mult_eq_1_to_2];
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   124
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   125
fun prep_simproc (name, pats, proc) =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   126
  Simplifier.simproc (the_context ()) name pats proc;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   127
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   128
structure CancelNumeralsCommon =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   129
  struct
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   130
  val mk_sum            = (fn T:typ => mk_sum)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   131
  val dest_sum          = dest_sum
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   132
  val mk_coeff          = mk_coeff
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   133
  val dest_coeff        = dest_coeff 1
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   134
  val find_first_coeff  = find_first_coeff []
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   135
  fun trans_tac _       = ArithData.gen_trans_tac iff_trans
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   136
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   137
  val norm_ss1 = ZF_ss addsimps add_0s @ mult_1s @ diff_simps @ zminus_simps @ @{thms zadd_ac}
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   138
  val norm_ss2 = ZF_ss addsimps bin_simps @ int_mult_minus_simps @ intifys
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   139
  val norm_ss3 = ZF_ss addsimps int_minus_from_mult_simps @ @{thms zadd_ac} @ @{thms zmult_ac} @ tc_rules @ intifys
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   140
  fun norm_tac ss =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   141
    ALLGOALS (asm_simp_tac (Simplifier.inherit_context ss norm_ss1))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   142
    THEN ALLGOALS (asm_simp_tac (Simplifier.inherit_context ss norm_ss2))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   143
    THEN ALLGOALS (asm_simp_tac (Simplifier.inherit_context ss norm_ss3))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   144
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   145
  val numeral_simp_ss = ZF_ss addsimps add_0s @ bin_simps @ tc_rules @ intifys
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   146
  fun numeral_simp_tac ss =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   147
    ALLGOALS (simp_tac (Simplifier.inherit_context ss numeral_simp_ss))
32149
ef59550a55d3 renamed simpset_of to global_simpset_of, and local_simpset_of to simpset_of -- same for claset and clasimpset;
wenzelm
parents: 30607
diff changeset
   148
    THEN ALLGOALS (asm_simp_tac (simpset_of (Simplifier.the_context ss)))
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   149
  val simplify_meta_eq  = ArithData.simplify_meta_eq (add_0s @ mult_1s)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   150
  end;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   151
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   152
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   153
structure EqCancelNumerals = CancelNumeralsFun
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   154
 (open CancelNumeralsCommon
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   155
  val prove_conv = ArithData.prove_conv "inteq_cancel_numerals"
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   156
  val mk_bal   = FOLogic.mk_eq
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   157
  val dest_bal = FOLogic.dest_eq
27237
c94eefffc3a5 converted ML proofs;
wenzelm
parents: 27154
diff changeset
   158
  val bal_add1 = @{thm eq_add_iff1} RS iff_trans
c94eefffc3a5 converted ML proofs;
wenzelm
parents: 27154
diff changeset
   159
  val bal_add2 = @{thm eq_add_iff2} RS iff_trans
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   160
);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   161
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   162
structure LessCancelNumerals = CancelNumeralsFun
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   163
 (open CancelNumeralsCommon
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   164
  val prove_conv = ArithData.prove_conv "intless_cancel_numerals"
26059
b67a225b50fd removed unnecessary theory qualifiers;
wenzelm
parents: 26056
diff changeset
   165
  val mk_bal   = FOLogic.mk_binrel @{const_name "zless"}
26190
cf51a23c0cd0 tuned ML code, more antiquotations;
wenzelm
parents: 26059
diff changeset
   166
  val dest_bal = FOLogic.dest_bin @{const_name "zless"} @{typ i}
27237
c94eefffc3a5 converted ML proofs;
wenzelm
parents: 27154
diff changeset
   167
  val bal_add1 = @{thm less_add_iff1} RS iff_trans
c94eefffc3a5 converted ML proofs;
wenzelm
parents: 27154
diff changeset
   168
  val bal_add2 = @{thm less_add_iff2} RS iff_trans
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   169
);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   170
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   171
structure LeCancelNumerals = CancelNumeralsFun
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   172
 (open CancelNumeralsCommon
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   173
  val prove_conv = ArithData.prove_conv "intle_cancel_numerals"
26059
b67a225b50fd removed unnecessary theory qualifiers;
wenzelm
parents: 26056
diff changeset
   174
  val mk_bal   = FOLogic.mk_binrel @{const_name "zle"}
26190
cf51a23c0cd0 tuned ML code, more antiquotations;
wenzelm
parents: 26059
diff changeset
   175
  val dest_bal = FOLogic.dest_bin @{const_name "zle"} @{typ i}
27237
c94eefffc3a5 converted ML proofs;
wenzelm
parents: 27154
diff changeset
   176
  val bal_add1 = @{thm le_add_iff1} RS iff_trans
c94eefffc3a5 converted ML proofs;
wenzelm
parents: 27154
diff changeset
   177
  val bal_add2 = @{thm le_add_iff2} RS iff_trans
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   178
);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   179
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   180
val cancel_numerals =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   181
  map prep_simproc
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   182
   [("inteq_cancel_numerals",
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   183
     ["l $+ m = n", "l = m $+ n",
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   184
      "l $- m = n", "l = m $- n",
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   185
      "l $* m = n", "l = m $* n"],
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   186
     K EqCancelNumerals.proc),
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   187
    ("intless_cancel_numerals",
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   188
     ["l $+ m $< n", "l $< m $+ n",
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   189
      "l $- m $< n", "l $< m $- n",
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   190
      "l $* m $< n", "l $< m $* n"],
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   191
     K LessCancelNumerals.proc),
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   192
    ("intle_cancel_numerals",
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   193
     ["l $+ m $<= n", "l $<= m $+ n",
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   194
      "l $- m $<= n", "l $<= m $- n",
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   195
      "l $* m $<= n", "l $<= m $* n"],
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   196
     K LeCancelNumerals.proc)];
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   197
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   198
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   199
(*version without the hyps argument*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   200
fun prove_conv_nohyps name tacs sg = ArithData.prove_conv name tacs sg [];
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   201
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   202
structure CombineNumeralsData =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   203
  struct
24630
351a308ab58d simplified type int (eliminated IntInf.int, integer);
wenzelm
parents: 23146
diff changeset
   204
  type coeff            = int
351a308ab58d simplified type int (eliminated IntInf.int, integer);
wenzelm
parents: 23146
diff changeset
   205
  val iszero            = (fn x => x = 0)
351a308ab58d simplified type int (eliminated IntInf.int, integer);
wenzelm
parents: 23146
diff changeset
   206
  val add               = op + 
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   207
  val mk_sum            = (fn T:typ => long_mk_sum) (*to work for #2*x $+ #3*x *)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   208
  val dest_sum          = dest_sum
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   209
  val mk_coeff          = mk_coeff
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   210
  val dest_coeff        = dest_coeff 1
27237
c94eefffc3a5 converted ML proofs;
wenzelm
parents: 27154
diff changeset
   211
  val left_distrib      = @{thm left_zadd_zmult_distrib} RS trans
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   212
  val prove_conv        = prove_conv_nohyps "int_combine_numerals"
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   213
  fun trans_tac _       = ArithData.gen_trans_tac trans
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   214
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   215
  val norm_ss1 = ZF_ss addsimps add_0s @ mult_1s @ diff_simps @ zminus_simps @ @{thms zadd_ac} @ intifys
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   216
  val norm_ss2 = ZF_ss addsimps bin_simps @ int_mult_minus_simps @ intifys
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   217
  val norm_ss3 = ZF_ss addsimps int_minus_from_mult_simps @ @{thms zadd_ac} @ @{thms zmult_ac} @ tc_rules @ intifys
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   218
  fun norm_tac ss =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   219
    ALLGOALS (asm_simp_tac (Simplifier.inherit_context ss norm_ss1))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   220
    THEN ALLGOALS (asm_simp_tac (Simplifier.inherit_context ss norm_ss2))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   221
    THEN ALLGOALS (asm_simp_tac (Simplifier.inherit_context ss norm_ss3))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   222
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   223
  val numeral_simp_ss = ZF_ss addsimps add_0s @ bin_simps @ tc_rules @ intifys
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   224
  fun numeral_simp_tac ss =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   225
    ALLGOALS (simp_tac (Simplifier.inherit_context ss numeral_simp_ss))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   226
  val simplify_meta_eq  = ArithData.simplify_meta_eq (add_0s @ mult_1s)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   227
  end;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   228
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   229
structure CombineNumerals = CombineNumeralsFun(CombineNumeralsData);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   230
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   231
val combine_numerals =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   232
  prep_simproc ("int_combine_numerals", ["i $+ j", "i $- j"], K CombineNumerals.proc);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   233
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   234
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   235
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   236
(** Constant folding for integer multiplication **)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   237
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   238
(*The trick is to regard products as sums, e.g. #3 $* x $* #4 as
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   239
  the "sum" of #3, x, #4; the literals are then multiplied*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   240
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   241
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   242
structure CombineNumeralsProdData =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   243
  struct
24630
351a308ab58d simplified type int (eliminated IntInf.int, integer);
wenzelm
parents: 23146
diff changeset
   244
  type coeff            = int
351a308ab58d simplified type int (eliminated IntInf.int, integer);
wenzelm
parents: 23146
diff changeset
   245
  val iszero            = (fn x => x = 0)
351a308ab58d simplified type int (eliminated IntInf.int, integer);
wenzelm
parents: 23146
diff changeset
   246
  val add               = op *
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   247
  val mk_sum            = (fn T:typ => mk_prod)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   248
  val dest_sum          = dest_prod
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   249
  fun mk_coeff(k,t) = if t=one then mk_numeral k
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   250
                      else raise TERM("mk_coeff", [])
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   251
  fun dest_coeff t = (dest_numeral t, one)  (*We ONLY want pure numerals.*)
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   252
  val left_distrib      = @{thm zmult_assoc} RS sym RS trans
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   253
  val prove_conv        = prove_conv_nohyps "int_combine_numerals_prod"
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   254
  fun trans_tac _       = ArithData.gen_trans_tac trans
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   255
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   256
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   257
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   258
val norm_ss1 = ZF_ss addsimps mult_1s @ diff_simps @ zminus_simps
24893
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   259
  val norm_ss2 = ZF_ss addsimps [@{thm zmult_zminus_right} RS sym] @
b8ef7afe3a6b modernized specifications;
wenzelm
parents: 24630
diff changeset
   260
    bin_simps @ @{thms zmult_ac} @ tc_rules @ intifys
23146
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   261
  fun norm_tac ss =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   262
    ALLGOALS (asm_simp_tac (Simplifier.inherit_context ss norm_ss1))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   263
    THEN ALLGOALS (asm_simp_tac (Simplifier.inherit_context ss norm_ss2))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   264
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   265
  val numeral_simp_ss = ZF_ss addsimps bin_simps @ tc_rules @ intifys
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   266
  fun numeral_simp_tac ss =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   267
    ALLGOALS (simp_tac (Simplifier.inherit_context ss numeral_simp_ss))
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   268
  val simplify_meta_eq  = ArithData.simplify_meta_eq (mult_1s);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   269
  end;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   270
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   271
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   272
structure CombineNumeralsProd = CombineNumeralsFun(CombineNumeralsProdData);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   273
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   274
val combine_numerals_prod =
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   275
  prep_simproc ("int_combine_numerals_prod", ["i $* j"], K CombineNumeralsProd.proc);
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   276
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   277
end;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   278
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   279
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   280
Addsimprocs Int_Numeral_Simprocs.cancel_numerals;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   281
Addsimprocs [Int_Numeral_Simprocs.combine_numerals,
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   282
             Int_Numeral_Simprocs.combine_numerals_prod];
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   283
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   284
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   285
(*examples:*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   286
(*
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   287
print_depth 22;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   288
set timing;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   289
set trace_simp;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   290
fun test s = (Goal s; by (Asm_simp_tac 1));
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   291
val sg = #sign (rep_thm (topthm()));
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   292
val t = FOLogic.dest_Trueprop (Logic.strip_assums_concl(getgoal 1));
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   293
val (t,_) = FOLogic.dest_eq t;
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   294
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   295
(*combine_numerals_prod (products of separate literals) *)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   296
test "#5 $* x $* #3 = y";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   297
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   298
test "y2 $+ ?x42 = y $+ y2";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   299
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   300
test "oo : int ==> l $+ (l $+ #2) $+ oo = oo";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   301
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   302
test "#9$*x $+ y = x$*#23 $+ z";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   303
test "y $+ x = x $+ z";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   304
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   305
test "x : int ==> x $+ y $+ z = x $+ z";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   306
test "x : int ==> y $+ (z $+ x) = z $+ x";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   307
test "z : int ==> x $+ y $+ z = (z $+ y) $+ (x $+ w)";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   308
test "z : int ==> x$*y $+ z = (z $+ y) $+ (y$*x $+ w)";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   309
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   310
test "#-3 $* x $+ y $<= x $* #2 $+ z";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   311
test "y $+ x $<= x $+ z";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   312
test "x $+ y $+ z $<= x $+ z";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   313
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   314
test "y $+ (z $+ x) $< z $+ x";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   315
test "x $+ y $+ z $< (z $+ y) $+ (x $+ w)";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   316
test "x$*y $+ z $< (z $+ y) $+ (y$*x $+ w)";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   317
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   318
test "l $+ #2 $+ #2 $+ #2 $+ (l $+ #2) $+ (oo $+ #2) = uu";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   319
test "u : int ==> #2 $* u = u";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   320
test "(i $+ j $+ #12 $+ k) $- #15 = y";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   321
test "(i $+ j $+ #12 $+ k) $- #5 = y";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   322
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   323
test "y $- b $< b";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   324
test "y $- (#3 $* b $+ c) $< b $- #2 $* c";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   325
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   326
test "(#2 $* x $- (u $* v) $+ y) $- v $* #3 $* u = w";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   327
test "(#2 $* x $* u $* v $+ (u $* v) $* #4 $+ y) $- v $* u $* #4 = w";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   328
test "(#2 $* x $* u $* v $+ (u $* v) $* #4 $+ y) $- v $* u = w";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   329
test "u $* v $- (x $* u $* v $+ (u $* v) $* #4 $+ y) = w";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   330
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   331
test "(i $+ j $+ #12 $+ k) = u $+ #15 $+ y";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   332
test "(i $+ j $* #2 $+ #12 $+ k) = j $+ #5 $+ y";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   333
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   334
test "#2 $* y $+ #3 $* z $+ #6 $* w $+ #2 $* y $+ #3 $* z $+ #2 $* u = #2 $* y' $+ #3 $* z' $+ #6 $* w' $+ #2 $* y' $+ #3 $* z' $+ u $+ vv";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   335
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   336
test "a $+ $-(b$+c) $+ b = d";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   337
test "a $+ $-(b$+c) $- b = d";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   338
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   339
(*negative numerals*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   340
test "(i $+ j $+ #-2 $+ k) $- (u $+ #5 $+ y) = zz";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   341
test "(i $+ j $+ #-3 $+ k) $< u $+ #5 $+ y";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   342
test "(i $+ j $+ #3 $+ k) $< u $+ #-6 $+ y";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   343
test "(i $+ j $+ #-12 $+ k) $- #15 = y";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   344
test "(i $+ j $+ #12 $+ k) $- #-15 = y";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   345
test "(i $+ j $+ #-12 $+ k) $- #-15 = y";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   346
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   347
(*Multiplying separated numerals*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   348
Goal "#6 $* ($# x $* #2) =  uu";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   349
Goal "#4 $* ($# x $* $# x) $* (#2 $* $# x) =  uu";
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   350
*)
0bc590051d95 moved Integ files to canonical place;
wenzelm
parents:
diff changeset
   351