Wed, 21 Feb 2001 12:57:55 +0100 revisions in response to comments by Tobias
paulson [Wed, 21 Feb 2001 12:57:55 +0100] rev 11173
revisions in response to comments by Tobias
Wed, 21 Feb 2001 12:07:00 +0100 added split_conv_tac (also to claset()) as an optimization
oheimb [Wed, 21 Feb 2001 12:07:00 +0100] rev 11172
added split_conv_tac (also to claset()) as an optimization
Tue, 20 Feb 2001 18:53:28 +0100 made split_all_tac safe introducing safe_full_simp_tac, EXISTING PROOFS MAY FAIL
oheimb [Tue, 20 Feb 2001 18:53:28 +0100] rev 11171
made split_all_tac safe introducing safe_full_simp_tac, EXISTING PROOFS MAY FAIL
Tue, 20 Feb 2001 18:48:34 +0100 simplified proofs for splitI and splitD, added splitD'
oheimb [Tue, 20 Feb 2001 18:48:34 +0100] rev 11170
simplified proofs for splitI and splitD, added splitD' added split_conv_tac (also to claset()) as an optimization made split_all_tac safe introducing safe_full_simp_tac,EXISTING PROOFS MAY FAIL
Tue, 20 Feb 2001 18:47:34 +0100 made split_all_tac safe introducing safe_full_simp_tac, EXISTING PROOFS MAY FAIL
oheimb [Tue, 20 Feb 2001 18:47:34 +0100] rev 11169
made split_all_tac safe introducing safe_full_simp_tac, EXISTING PROOFS MAY FAIL
Tue, 20 Feb 2001 18:47:32 +0100 corrected comments on addbefore and addSbefore
oheimb [Tue, 20 Feb 2001 18:47:32 +0100] rev 11168
corrected comments on addbefore and addSbefore
Tue, 20 Feb 2001 18:47:30 +0100 added same_fstI
oheimb [Tue, 20 Feb 2001 18:47:30 +0100] rev 11167
added same_fstI
Tue, 20 Feb 2001 18:47:29 +0100 simplified definition of wrapper bspec
oheimb [Tue, 20 Feb 2001 18:47:29 +0100] rev 11166
simplified definition of wrapper bspec
Tue, 20 Feb 2001 18:47:27 +0100 added image_cong to default congs of recdef
oheimb [Tue, 20 Feb 2001 18:47:27 +0100] rev 11165
added image_cong to default congs of recdef
Tue, 20 Feb 2001 18:47:25 +0100 added add_arith (just as hint by now)
oheimb [Tue, 20 Feb 2001 18:47:25 +0100] rev 11164
added add_arith (just as hint by now)
Tue, 20 Feb 2001 18:47:22 +0100 added rearrange_prems
oheimb [Tue, 20 Feb 2001 18:47:22 +0100] rev 11163
added rearrange_prems
Tue, 20 Feb 2001 18:47:06 +0100 debugging: replaced gen_all by forall_elim_vars_safe
oheimb [Tue, 20 Feb 2001 18:47:06 +0100] rev 11162
debugging: replaced gen_all by forall_elim_vars_safe
Tue, 20 Feb 2001 13:23:58 +0100 *** empty log message ***
nipkow [Tue, 20 Feb 2001 13:23:58 +0100] rev 11161
*** empty log message ***
Tue, 20 Feb 2001 11:27:04 +0100 *** empty log message ***
nipkow [Tue, 20 Feb 2001 11:27:04 +0100] rev 11160
*** empty log message ***
Tue, 20 Feb 2001 10:37:12 +0100 *** empty log message ***
nipkow [Tue, 20 Feb 2001 10:37:12 +0100] rev 11159
*** empty log message ***
Tue, 20 Feb 2001 10:18:26 +0100 *** empty log message ***
nipkow [Tue, 20 Feb 2001 10:18:26 +0100] rev 11158
*** empty log message ***
Sat, 17 Feb 2001 10:43:53 +0100 *** empty log message ***
nipkow [Sat, 17 Feb 2001 10:43:53 +0100] rev 11157
*** empty log message ***
Fri, 16 Feb 2001 18:51:19 +0100 fixed the obvious errors Tobias found
paulson [Fri, 16 Feb 2001 18:51:19 +0100] rev 11156
fixed the obvious errors Tobias found
Fri, 16 Feb 2001 18:50:09 +0100 Least_def now refers to LeastM
paulson [Fri, 16 Feb 2001 18:50:09 +0100] rev 11155
Least_def now refers to LeastM
Fri, 16 Feb 2001 13:47:06 +0100 for the change to LEAST
paulson [Fri, 16 Feb 2001 13:47:06 +0100] rev 11154
for the change to LEAST
Fri, 16 Feb 2001 13:37:21 +0100 Blast bug fix made old proof too slow
paulson [Fri, 16 Feb 2001 13:37:21 +0100] rev 11153
Blast bug fix made old proof too slow
Fri, 16 Feb 2001 13:29:07 +0100 Blast bug fix: now always duplicates when applying a haz rule,
paulson [Fri, 16 Feb 2001 13:29:07 +0100] rev 11152
Blast bug fix: now always duplicates when applying a haz rule, whether or not new variables are added. Can now prove theorems such as these: val prems = Goal "[|P==>Q; P==>~Q|] ==> ~P"; by (blast_tac (claset() addDs prems) 1); val prems = Goal "[|Q==>P; ~Q==>P|] ==> P"; by (blast_tac (claset() addIs prems) 1);
Fri, 16 Feb 2001 13:27:56 +0100 Blast bug fix made old proof too slow
paulson [Fri, 16 Feb 2001 13:27:56 +0100] rev 11151
Blast bug fix made old proof too slow
Fri, 16 Feb 2001 13:25:08 +0100 Streamlining for the bug fix in Blast.
paulson [Fri, 16 Feb 2001 13:25:08 +0100] rev 11150
Streamlining for the bug fix in Blast. MPair_parts now built in using AddSEs, throughout.
Fri, 16 Feb 2001 08:27:17 +0100 *** empty log message ***
nipkow [Fri, 16 Feb 2001 08:27:17 +0100] rev 11149
*** empty log message ***
Fri, 16 Feb 2001 08:10:28 +0100 *** empty log message ***
nipkow [Fri, 16 Feb 2001 08:10:28 +0100] rev 11148
*** empty log message ***
Fri, 16 Feb 2001 06:46:20 +0100 *** empty log message ***
nipkow [Fri, 16 Feb 2001 06:46:20 +0100] rev 11147
*** empty log message ***
Fri, 16 Feb 2001 00:36:21 +0100 tuned;
wenzelm [Fri, 16 Feb 2001 00:36:21 +0100] rev 11146
tuned;
Thu, 15 Feb 2001 17:18:54 +0100 eliminate get_def; Isabelle99-2
wenzelm [Thu, 15 Feb 2001 17:18:54 +0100] rev 11145
eliminate get_def;
Thu, 15 Feb 2001 16:12:27 +0100 tuned;
wenzelm [Thu, 15 Feb 2001 16:12:27 +0100] rev 11144
tuned;
Thu, 15 Feb 2001 16:07:57 +0100 Ord.thy/.ML converted to Isar
oheimb [Thu, 15 Feb 2001 16:07:57 +0100] rev 11143
Ord.thy/.ML converted to Isar
Thu, 15 Feb 2001 16:01:47 +0100 moved inv_image to Relation
oheimb [Thu, 15 Feb 2001 16:01:47 +0100] rev 11142
moved inv_image to Relation nonempty_has_least of Nat.ML -> ex_has_least_nat of Wellfounded_Relations.ML added wf_linord_ex_has_least,LeastM_nat_lemma,LeastM_natI,LeastM_nat_le
Thu, 15 Feb 2001 16:01:34 +0100 supressed some warnings on identical proofstate
oheimb [Thu, 15 Feb 2001 16:01:34 +0100] rev 11141
supressed some warnings on identical proofstate moved wellorder_LeastI,wellorder_Least_le,wellorder_not_less_Least from Nat.ML to Wellfounded_Recursion.ML added wellorder axclass
Thu, 15 Feb 2001 16:01:22 +0100 Ord.thy/.ML converted to Isar
oheimb [Thu, 15 Feb 2001 16:01:22 +0100] rev 11140
Ord.thy/.ML converted to Isar added min_of_mono, max_of_mono, max_leastL, max_leastR to Ord.thy moved Least_equality from Nat.ML to Ord.thy added LeastM operator
Thu, 15 Feb 2001 16:01:07 +0100 moved wellorder_LeastI,wellorder_Least_le,wellorder_not_less_Least
oheimb [Thu, 15 Feb 2001 16:01:07 +0100] rev 11139
moved wellorder_LeastI,wellorder_Least_le,wellorder_not_less_Least from Nat.ML to Wellfounded_Recursion.ML moved Least_equality from Nat.ML to Ord.thy moved wf_less from Nat.ML to NatDef.ML added wellorder axclass nonempty_has_least of Nat.ML -> ex_has_least_nat of Wellfounded_Relations.ML added min_of_mono, max_of_mono, max_leastL, max_leastR to Ord.thy
Thu, 15 Feb 2001 16:00:44 +0100 simplified proof of Least_mono
oheimb [Thu, 15 Feb 2001 16:00:44 +0100] rev 11138
simplified proof of Least_mono
Thu, 15 Feb 2001 16:00:42 +0100 added wellorder axclass
oheimb [Thu, 15 Feb 2001 16:00:42 +0100] rev 11137
added wellorder axclass
Thu, 15 Feb 2001 16:00:40 +0100 moved inv_image to Relation
oheimb [Thu, 15 Feb 2001 16:00:40 +0100] rev 11136
moved inv_image to Relation
Thu, 15 Feb 2001 16:00:38 +0100 moved wf_less from Nat.ML to NatDef.ML
oheimb [Thu, 15 Feb 2001 16:00:38 +0100] rev 11135
moved wf_less from Nat.ML to NatDef.ML
Thu, 15 Feb 2001 16:00:36 +0100 added nat as instance of new wellorder axclass
oheimb [Thu, 15 Feb 2001 16:00:36 +0100] rev 11134
added nat as instance of new wellorder axclass
Thu, 15 Feb 2001 16:00:35 +0100 Ord.thy/.ML converted to Isar
oheimb [Thu, 15 Feb 2001 16:00:35 +0100] rev 11133
Ord.thy/.ML converted to Isar
Thu, 15 Feb 2001 15:56:51 +0100 added trial proof
oheimb [Thu, 15 Feb 2001 15:56:51 +0100] rev 11132
added trial proof
Thu, 15 Feb 2001 14:30:13 +0100 improved subst_RS
oheimb [Thu, 15 Feb 2001 14:30:13 +0100] rev 11131
improved subst_RS
Thu, 15 Feb 2001 13:07:03 +0100 added missiong word
oheimb [Thu, 15 Feb 2001 13:07:03 +0100] rev 11130
added missiong word
Thu, 15 Feb 2001 11:15:39 +0100 *** empty log message ***
nipkow [Thu, 15 Feb 2001 11:15:39 +0100] rev 11129
*** empty log message ***
Thu, 15 Feb 2001 00:53:45 +0100 index mod syntax;
wenzelm [Thu, 15 Feb 2001 00:53:45 +0100] rev 11128
index mod syntax;
Wed, 14 Feb 2001 23:43:55 +0100 tuned;
wenzelm [Wed, 14 Feb 2001 23:43:55 +0100] rev 11127
tuned;
Wed, 14 Feb 2001 23:42:45 +0100 isatool install -k;
wenzelm [Wed, 14 Feb 2001 23:42:45 +0100] rev 11126
isatool install -k;
Wed, 14 Feb 2001 23:18:47 +0100 handle KDE version 1 or 2;
wenzelm [Wed, 14 Feb 2001 23:18:47 +0100] rev 11125
handle KDE version 1 or 2;
Wed, 14 Feb 2001 23:17:53 +0100 isatool install handles KDE version 1 or 2;
wenzelm [Wed, 14 Feb 2001 23:17:53 +0100] rev 11124
isatool install handles KDE version 1 or 2;
Wed, 14 Feb 2001 20:45:35 +0100 removed whitespace
oheimb [Wed, 14 Feb 2001 20:45:35 +0100] rev 11123
removed whitespace
Wed, 14 Feb 2001 20:44:59 +0100 supressed some warnings on identical proofstate
oheimb [Wed, 14 Feb 2001 20:44:59 +0100] rev 11122
supressed some warnings on identical proofstate
Wed, 14 Feb 2001 19:31:05 +0100 adhoc script for creating complete Isabelle dist pages;
wenzelm [Wed, 14 Feb 2001 19:31:05 +0100] rev 11121
adhoc script for creating complete Isabelle dist pages;
Wed, 14 Feb 2001 19:27:49 +0100 imp_cong2 -> imp_cong
berghofe [Wed, 14 Feb 2001 19:27:49 +0100] rev 11120
imp_cong2 -> imp_cong
Wed, 14 Feb 2001 13:26:46 +0100 new function get_overloads
paulson [Wed, 14 Feb 2001 13:26:46 +0100] rev 11119
new function get_overloads
Wed, 14 Feb 2001 13:19:14 +0100 updated the unicity proof
paulson [Wed, 14 Feb 2001 13:19:14 +0100] rev 11118
updated the unicity proof
Wed, 14 Feb 2001 13:01:02 +0100 tidying
paulson [Wed, 14 Feb 2001 13:01:02 +0100] rev 11117
tidying
Wed, 14 Feb 2001 12:22:49 +0100 not_bad_tac is obsolete
paulson [Wed, 14 Feb 2001 12:22:49 +0100] rev 11116
not_bad_tac is obsolete
Wed, 14 Feb 2001 12:16:32 +0100 a new theorem from Bryan Ford
paulson [Wed, 14 Feb 2001 12:16:32 +0100] rev 11115
a new theorem from Bryan Ford
Wed, 14 Feb 2001 11:18:39 +0100 added support for AddXIs, AddXEs, AddXDs
oheimb [Wed, 14 Feb 2001 11:18:39 +0100] rev 11114
added support for AddXIs, AddXEs, AddXDs
Wed, 14 Feb 2001 01:36:36 +0100 tuned;
wenzelm [Wed, 14 Feb 2001 01:36:36 +0100] rev 11113
tuned;
Tue, 13 Feb 2001 22:51:08 +0100 tuned;
wenzelm [Tue, 13 Feb 2001 22:51:08 +0100] rev 11112
tuned;
Tue, 13 Feb 2001 22:04:09 +0100 tuned;
wenzelm [Tue, 13 Feb 2001 22:04:09 +0100] rev 11111
tuned;
Tue, 13 Feb 2001 16:48:36 +0100 \remarksfalse;
wenzelm [Tue, 13 Feb 2001 16:48:36 +0100] rev 11110
\remarksfalse;
Tue, 13 Feb 2001 16:31:18 +0100 tuned;
wenzelm [Tue, 13 Feb 2001 16:31:18 +0100] rev 11109
tuned;
Tue, 13 Feb 2001 16:05:56 +0100 swapped Fleuriot and Paulson
paulson [Tue, 13 Feb 2001 16:05:56 +0100] rev 11108
swapped Fleuriot and Paulson
Tue, 13 Feb 2001 16:05:09 +0100 create dist packages;
wenzelm [Tue, 13 Feb 2001 16:05:09 +0100] rev 11107
create dist packages;
Tue, 13 Feb 2001 16:02:53 +0100 partial conversion to Isar script style in HOL/Auth removes some .ML files
paulson [Tue, 13 Feb 2001 16:02:53 +0100] rev 11106
partial conversion to Isar script style in HOL/Auth removes some .ML files
Tue, 13 Feb 2001 15:46:03 +0100 partial conversion to Isar script style in HOL/Auth removes some .ML files
paulson [Tue, 13 Feb 2001 15:46:03 +0100] rev 11105
partial conversion to Isar script style in HOL/Auth removes some .ML files
Tue, 13 Feb 2001 13:16:27 +0100 partial conversion to Isar script style
paulson [Tue, 13 Feb 2001 13:16:27 +0100] rev 11104
partial conversion to Isar script style simplified unicity proofs
Tue, 13 Feb 2001 01:32:54 +0100 tuned;
wenzelm [Tue, 13 Feb 2001 01:32:54 +0100] rev 11103
tuned;
Mon, 12 Feb 2001 20:47:19 +0100 tuned;
wenzelm [Mon, 12 Feb 2001 20:47:19 +0100] rev 11102
tuned;
Mon, 12 Feb 2001 20:45:12 +0100 support \<subseteq> syntax in classes/classrel/axclass/instance;
wenzelm [Mon, 12 Feb 2001 20:45:12 +0100] rev 11101
support \<subseteq> syntax in classes/classrel/axclass/instance;
Mon, 12 Feb 2001 20:44:02 +0100 \<subseteq> syntax for classes/classrel/axclass/instance;
wenzelm [Mon, 12 Feb 2001 20:44:02 +0100] rev 11100
\<subseteq> syntax for classes/classrel/axclass/instance;
Mon, 12 Feb 2001 20:43:12 +0100 \<subseteq>;
wenzelm [Mon, 12 Feb 2001 20:43:12 +0100] rev 11099
\<subseteq>;
Sun, 11 Feb 2001 20:38:40 +0100 added "xsymbols" syntax for "=?=";
wenzelm [Sun, 11 Feb 2001 20:38:40 +0100] rev 11098
added "xsymbols" syntax for "=?=";
Sun, 11 Feb 2001 16:34:20 +0100 more robust selection of calculational rules;
wenzelm [Sun, 11 Feb 2001 16:34:20 +0100] rev 11097
more robust selection of calculational rules;
Sun, 11 Feb 2001 16:31:54 +0100 tuned trans rules;
wenzelm [Sun, 11 Feb 2001 16:31:54 +0100] rev 11096
tuned trans rules;
Sun, 11 Feb 2001 16:31:21 +0100 updated;
wenzelm [Sun, 11 Feb 2001 16:31:21 +0100] rev 11095
updated;
Sun, 11 Feb 2001 13:26:23 +0100 tuned;
wenzelm [Sun, 11 Feb 2001 13:26:23 +0100] rev 11094
tuned;
Sat, 10 Feb 2001 08:52:41 +0100 Changes to HOL/Algebra:
ballarin [Sat, 10 Feb 2001 08:52:41 +0100] rev 11093
Changes to HOL/Algebra: - Axclasses consolidated (axiom one_not_zero). - Now uses summation operator setsum; SUM has been removed. - Priority of infix assoc changed to 50, in accordance to dvd.
Sat, 10 Feb 2001 08:49:36 +0100 Definition of setsum (sort constraint) relaxed to {zero, plus}.
ballarin [Sat, 10 Feb 2001 08:49:36 +0100] rev 11092
Definition of setsum (sort constraint) relaxed to {zero, plus}.
Sat, 10 Feb 2001 08:48:10 +0100 Updates to HOL/Algebra:
ballarin [Sat, 10 Feb 2001 08:48:10 +0100] rev 11091
Updates to HOL/Algebra: - axclasses consolidated (lemma one_not_zero) - summation operator SUM removed, now uses setsum Use of setsum made it necessary to relax sort constraint in its definition to {zero, plus}.
Fri, 09 Feb 2001 23:48:50 +0100 tuned;
wenzelm [Fri, 09 Feb 2001 23:48:50 +0100] rev 11090
tuned;
Fri, 09 Feb 2001 23:48:33 +0100 lower priority for forw_subst;
wenzelm [Fri, 09 Feb 2001 23:48:33 +0100] rev 11089
lower priority for forw_subst;
Fri, 09 Feb 2001 20:34:42 +0100 tuned;
wenzelm [Fri, 09 Feb 2001 20:34:42 +0100] rev 11088
tuned;
Fri, 09 Feb 2001 16:23:40 +0100 not used any more (all Isar style)
kleing [Fri, 09 Feb 2001 16:23:40 +0100] rev 11087
not used any more (all Isar style)
Fri, 09 Feb 2001 16:22:30 +0100 removed MicroJava/Digest.thy
kleing [Fri, 09 Feb 2001 16:22:30 +0100] rev 11086
removed MicroJava/Digest.thy
Fri, 09 Feb 2001 16:01:58 +0100 tuned for 99-2 release
kleing [Fri, 09 Feb 2001 16:01:58 +0100] rev 11085
tuned for 99-2 release
Fri, 09 Feb 2001 11:40:10 +0100 unsymbolized;
wenzelm [Fri, 09 Feb 2001 11:40:10 +0100] rev 11084
unsymbolized; tuned;
Wed, 07 Feb 2001 20:57:03 +0100 tuned;
wenzelm [Wed, 07 Feb 2001 20:57:03 +0100] rev 11083
tuned;
Wed, 07 Feb 2001 20:56:40 +0100 improved;
wenzelm [Wed, 07 Feb 2001 20:56:40 +0100] rev 11082
improved;
Wed, 07 Feb 2001 17:40:56 +0100 solved non-initialization problems; improvements using prefer
oheimb [Wed, 07 Feb 2001 17:40:56 +0100] rev 11081
solved non-initialization problems; improvements using prefer
Wed, 07 Feb 2001 16:37:24 +0100 various revisions in response to comments from Tobias
paulson [Wed, 07 Feb 2001 16:37:24 +0100] rev 11080
various revisions in response to comments from Tobias
Wed, 07 Feb 2001 12:15:59 +0100 val get_goal: state -> context * (thm list * thm);
wenzelm [Wed, 07 Feb 2001 12:15:59 +0100] rev 11079
val get_goal: state -> context * (thm list * thm);
Tue, 06 Feb 2001 18:41:27 +0100 4.0 version;
wenzelm [Tue, 06 Feb 2001 18:41:27 +0100] rev 11078
4.0 version;
Tue, 06 Feb 2001 18:37:59 +0100 snapshot of a new version
paulson [Tue, 06 Feb 2001 18:37:59 +0100] rev 11077
snapshot of a new version
Tue, 06 Feb 2001 15:02:56 +0100 new theorem Transset_iff_Union_subset
paulson [Tue, 06 Feb 2001 15:02:56 +0100] rev 11076
new theorem Transset_iff_Union_subset
Tue, 06 Feb 2001 14:42:28 +0100 tuned
kleing [Tue, 06 Feb 2001 14:42:28 +0100] rev 11075
tuned
Mon, 05 Feb 2001 21:33:47 +0100 improved;
wenzelm [Mon, 05 Feb 2001 21:33:47 +0100] rev 11074
improved;
Mon, 05 Feb 2001 20:44:51 +0100 polyml multiplatform setup;
wenzelm [Mon, 05 Feb 2001 20:44:51 +0100] rev 11073
polyml multiplatform setup;
Mon, 05 Feb 2001 20:34:05 +0100 tuned
wenzelm [Mon, 05 Feb 2001 20:34:05 +0100] rev 11072
tuned
Mon, 05 Feb 2001 20:33:50 +0100 tuned;
wenzelm [Mon, 05 Feb 2001 20:33:50 +0100] rev 11071
tuned;
Mon, 05 Feb 2001 20:14:15 +0100 improved document (added headers etc)
oheimb [Mon, 05 Feb 2001 20:14:15 +0100] rev 11070
improved document (added headers etc)
Mon, 05 Feb 2001 14:59:44 +0100 tuned
wenzelm [Mon, 05 Feb 2001 14:59:44 +0100] rev 11069
tuned
Mon, 05 Feb 2001 14:57:17 +0100 improvements concerning instantiations etc.
oheimb [Mon, 05 Feb 2001 14:57:17 +0100] rev 11068
improvements concerning instantiations etc.
Mon, 05 Feb 2001 14:54:04 +0100 disable non-existant chapters
wenzelm [Mon, 05 Feb 2001 14:54:04 +0100] rev 11067
disable non-existant chapters
Mon, 05 Feb 2001 14:40:21 +0100 tuned;
wenzelm [Mon, 05 Feb 2001 14:40:21 +0100] rev 11066
tuned;
Mon, 05 Feb 2001 14:39:09 +0100 fixed version string;
wenzelm [Mon, 05 Feb 2001 14:39:09 +0100] rev 11065
fixed version string;
Mon, 05 Feb 2001 14:38:11 +0100 polyml-3.x.ML vs polyml-4.0.ML;
wenzelm [Mon, 05 Feb 2001 14:38:11 +0100] rev 11064
polyml-3.x.ML vs polyml-4.0.ML;
Mon, 05 Feb 2001 14:37:10 +0100 renamed polyml.ML to polyml-3.x.ML and polyml-4.0.ML to polyml.ML (default);
wenzelm [Mon, 05 Feb 2001 14:37:10 +0100] rev 11063
renamed polyml.ML to polyml-3.x.ML and polyml-4.0.ML to polyml.ML (default);
Mon, 05 Feb 2001 14:31:49 +0100 tuned;
wenzelm [Mon, 05 Feb 2001 14:31:49 +0100] rev 11062
tuned;
(0) -10000 -3000 -1000 -112 +112 +1000 +3000 +10000 +30000 tip