diff options
| -rw-r--r-- | Makefile.build | 2 | ||||
| -rw-r--r-- | Makefile.common | 6 | ||||
| -rw-r--r-- | plugins/pluginsbyte.itarget | 1 | ||||
| -rw-r--r-- | plugins/pluginsdyn.itarget | 1 | ||||
| -rw-r--r-- | plugins/pluginsopt.itarget | 1 | ||||
| -rw-r--r-- | plugins/pluginsvo.itarget | 1 | ||||
| -rw-r--r-- | plugins/setoid_ring/Cring.v | 8 | ||||
| -rw-r--r-- | plugins/setoid_ring/Cring_tac.v | 15 | ||||
| -rw-r--r-- | plugins/setoid_ring/vo.itarget | 2 |
9 files changed, 8 insertions, 29 deletions
diff --git a/Makefile.build b/Makefile.build index aa8a391c3d..d141528420 100644 --- a/Makefile.build +++ b/Makefile.build @@ -436,7 +436,7 @@ plugins: $(PLUGINSVO) omega: $(OMEGAVO) $(OMEGACMA) $(ROMEGAVO) $(ROMEGACMA) micromega: $(MICROMEGAVO) $(MICROMEGACMA) $(CSDPCERT) ring: $(RINGVO) $(RINGCMA) -setoid_ring: $(NEWRINGVO) $(NEWRINGCMA) $(NCRINGVO) $(NCRINGCMA) +setoid_ring: $(NEWRINGVO) $(NEWRINGCMA) nsatz: $(NSATZVO) $(NSATZCMA) dp: $(DPCMA) xml: $(XMLVO) $(XMLCMA) diff --git a/Makefile.common b/Makefile.common index a564d0e6a1..fa76dac60b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -171,7 +171,6 @@ MICROMEGACMA:=plugins/micromega/micromega_plugin.cma QUOTECMA:=plugins/quote/quote_plugin.cma RINGCMA:=plugins/ring/ring_plugin.cma NEWRINGCMA:=plugins/setoid_ring/newring_plugin.cma -NCRINGCMA:=plugins/setoid_ring/ncring_plugin.cma NSATZCMA:=plugins/nsatz/nsatz_plugin.cma DPCMA:=plugins/dp/dp_plugin.cma FIELDCMA:=plugins/field/field_plugin.cma @@ -193,7 +192,7 @@ OTHERSYNTAXCMA:=$(addprefix plugins/syntax/, \ DECLMODECMA:=plugins/decl_mode/decl_mode_plugin.cma PLUGINSCMA:=$(OMEGACMA) $(ROMEGACMA) $(MICROMEGACMA) $(DECLMODECMA) \ - $(QUOTECMA) $(RINGCMA) $(NEWRINGCMA) $(NCRINGCMA)$(DPCMA) $(FIELDCMA) \ + $(QUOTECMA) $(RINGCMA) $(NEWRINGCMA) $(DPCMA) $(FIELDCMA) \ $(FOURIERCMA) $(EXTRACTIONCMA) $(XMLCMA) \ $(CCCMA) $(FOCMA) $(SUBTACCMA) $(RTAUTOCMA) \ $(FUNINDCMA) $(NSATZCMA) $(NATSYNTAXCMA) $(OTHERSYNTAXCMA) @@ -306,7 +305,6 @@ QUOTEVO:=$(call cat_vo_itarget, plugins/quote) RINGVO:=$(call cat_vo_itarget, plugins/ring) FIELDVO:=$(call cat_vo_itarget, plugins/field) NEWRINGVO:=$(call cat_vo_itarget, plugins/setoid_ring) -NCRINGVO:=$(call cat_vo_itarget, plugins/setoid_ring) NSATZVO:=$(call cat_vo_itarget, plugins/nsatz) FOURIERVO:=$(call cat_vo_itarget, plugins/fourier) FUNINDVO:=$(call cat_vo_itarget, plugins/funind) @@ -318,7 +316,7 @@ CCVO:= PLUGINSVO:= $(OMEGAVO) $(ROMEGAVO) $(MICROMEGAVO) $(RINGVO) $(FIELDVO) \ $(XMLVO) $(FOURIERVO) $(CCVO) $(FUNINDVO) \ - $(RTAUTOVO) $(NEWRINGVO) $(NCRINGVO)$(DPVO) $(QUOTEVO) \ + $(RTAUTOVO) $(NEWRINGVO) $(DPVO) $(QUOTEVO) \ $(NSATZVO) $(EXTRACTIONVO) ALLVO:= $(THEORIESVO) $(PLUGINSVO) diff --git a/plugins/pluginsbyte.itarget b/plugins/pluginsbyte.itarget index 402d22d1be..04cbdccb01 100644 --- a/plugins/pluginsbyte.itarget +++ b/plugins/pluginsbyte.itarget @@ -13,7 +13,6 @@ xml/xml_plugin.cma subtac/subtac_plugin.cma ring/ring_plugin.cma cc/cc_plugin.cma -ncring/ncring_plugin.cma nsatz/nsatz_plugin.cma funind/recdef_plugin.cma syntax/ascii_syntax_plugin.cma diff --git a/plugins/pluginsdyn.itarget b/plugins/pluginsdyn.itarget index c7c8553362..bbadfe696e 100644 --- a/plugins/pluginsdyn.itarget +++ b/plugins/pluginsdyn.itarget @@ -13,7 +13,6 @@ xml/xml_plugin.cmxs subtac/subtac_plugin.cmxs ring/ring_plugin.cmxs cc/cc_plugin.cmxs -ncring/ncring_plugin.cmxs nsatz/nsatz_plugin.cmxs funind/recdef_plugin.cmxs syntax/ascii_syntax_plugin.cmxs diff --git a/plugins/pluginsopt.itarget b/plugins/pluginsopt.itarget index 84ba2c6d74..74b3f5275f 100644 --- a/plugins/pluginsopt.itarget +++ b/plugins/pluginsopt.itarget @@ -13,7 +13,6 @@ xml/xml_plugin.cmxa subtac/subtac_plugin.cmxa ring/ring_plugin.cmxa cc/cc_plugin.cmxa -ncring/ncring_plugin.cmxa nsatz/nsatz_plugin.cmxa funind/recdef_plugin.cmxa syntax/ascii_syntax_plugin.cmxa diff --git a/plugins/pluginsvo.itarget b/plugins/pluginsvo.itarget index 421178f404..db56534c98 100644 --- a/plugins/pluginsvo.itarget +++ b/plugins/pluginsvo.itarget @@ -2,7 +2,6 @@ dp/vo.otarget field/vo.otarget fourier/vo.otarget funind/vo.otarget -ncring/vo.otarget nsatz/vo.otarget micromega/vo.otarget omega/vo.otarget diff --git a/plugins/setoid_ring/Cring.v b/plugins/setoid_ring/Cring.v index 46064385a9..5ba0160747 100644 --- a/plugins/setoid_ring/Cring.v +++ b/plugins/setoid_ring/Cring.v @@ -11,7 +11,6 @@ Require Import Setoid. Require Import BinPos. Require Import BinNat. -Require Export ZArith. Require Export Morphisms Setoid Bool. Require Import Algebra_syntax. Require Import Ring_theory. @@ -57,13 +56,8 @@ Instance opposite_cring`{R:Type}`{Rr:Cring R} : Opposite R := {opposite x := cring_opp x}. Instance equality_cring `{R:Type}`{Rr:Cring R} : Equality := {equality x y := cring_eq x y}. -Definition ZN(x:Z):= - match x with - Z0 => N0 - |Zpos p | Zneg p => Npos p -end. Instance power_cring {R:Type}{Rr:Cring R} : Power:= - {power x y := @Ring_theory.pow_N _ cring1 cring_mult x (ZN y)}. + {power x y := @Ring_theory.pow_N _ cring1 cring_mult x y}. Existing Instance cring_setoid. Existing Instance cring_plus_comp. diff --git a/plugins/setoid_ring/Cring_tac.v b/plugins/setoid_ring/Cring_tac.v index 8df45b56e7..c83dd4e8de 100644 --- a/plugins/setoid_ring/Cring_tac.v +++ b/plugins/setoid_ring/Cring_tac.v @@ -14,7 +14,6 @@ Require Import Znumtheory. Require Import Zdiv_def. Require Export Morphisms Setoid Bool. Require Import ZArith. -Open Scope Z_scope. Require Import Algebra_syntax. Require Import Ring_polynom. Require Export Cring. @@ -213,18 +212,14 @@ Variable R: Type. Variable Rr: Cring R. Existing Instance Rr. -Goal forall x y z:R, 3%Z * x * (2%Z * y * z) == 6%Z * (x * y) * z. -cring. -Qed. - (* reification: 0,7s sinon, le reste de la tactique donne le même temps que ring *) -Goal forall x y z t u :R, (x + y + z + t + u)^13 == (u + t + z + y + x) ^13. +Goal forall x y z t u :R, (x + y + z + t + u)^13%N == (u + t + z + y + x) ^13%N. Time cring. (*Finished transaction in 0. secs (0.410938u,0.s)*) Qed. (* -Goal forall x y z t u :R, (x + y + z + t + u)^16 == (u + t + z + y + x) ^16. +Goal forall x y z t u :R, (x + y + z + t + u)^16%N == (u + t + z + y + x) ^16%N. Time cring.(*Finished transaction in 1. secs (0.968852u,0.001s)*) Qed. *) @@ -242,10 +237,6 @@ Time ring.(*Finished transaction in 1. secs (0.914861u,0.s)*) Qed. *) -Goal forall x y z:R, 6*x^2 + y == y + 3*2*x^2 + 0 . -cring. -Qed. - (* Goal forall x y z:R, x + y == y + x + 0 . cring. @@ -255,7 +246,7 @@ Goal forall x y z:R, x * y * z == x * (y * z). cring. Qed. -Goal forall x y z:R, 3 * x * (2%Z * y * z) == 6 * (x * y) * z. +Goal forall x y z:R, 3%Z * x * (2%Z * y * z) == 6%Z * (x * y) * z. cring. Qed. diff --git a/plugins/setoid_ring/vo.itarget b/plugins/setoid_ring/vo.itarget index c4a21fd6aa..cccd21855d 100644 --- a/plugins/setoid_ring/vo.itarget +++ b/plugins/setoid_ring/vo.itarget @@ -20,4 +20,4 @@ Cring_tac.vo Ring2.vo Ring2_polynom.vo Ring2_initial.vo -Ring2_tac.vo +Ring2_tac.vo
\ No newline at end of file |