From d763f699ae49e60cfadd0e334f4f20e65aa494b4 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Wed, 27 Jul 2016 10:53:04 -0700 Subject: Restore functionality of Z.simplify_fractions_le After | File Name | Before || Change ---------------------------------------------------------------------------------- 1m47.80s | Total | 1m48.25s || -0m00.45s ---------------------------------------------------------------------------------- 0m34.29s | Specific/GF25519 | 0m34.05s || +0m00.24s 0m15.82s | ModularArithmetic/ModularBaseSystemProofs | 0m15.44s || +0m00.38s 0m11.45s | Experiments/SpecEd25519 | 0m11.70s || -0m00.25s 0m07.79s | Specific/GF1305 | 0m07.10s || +0m00.69s 0m04.18s | ModularArithmetic/Tutorial | 0m04.69s || -0m00.51s 0m04.07s | ModularArithmetic/Pow2BaseProofs | 0m04.62s || -0m00.54s 0m03.75s | BaseSystemProofs | 0m03.95s || -0m00.20s 0m03.23s | ModularArithmetic/ModularBaseSystemOpt | 0m03.22s || +0m00.00s 0m02.40s | Util/ZUtil | 0m02.37s || +0m00.02s 0m01.66s | BaseSystem | 0m01.23s || +0m00.42s 0m01.65s | ModularArithmetic/PrimeFieldTheorems | 0m01.61s || +0m00.03s 0m01.65s | Encoding/PointEncodingPre | 0m01.54s || +0m00.10s 0m01.59s | ModularArithmetic/ModularArithmeticTheorems | 0m01.56s || +0m00.03s 0m01.40s | Util/NumTheoryUtil | 0m01.34s || +0m00.05s 0m01.12s | Experiments/DerivationsOptionRectLetInEncoding | 0m01.49s || -0m00.36s 0m01.12s | ModularArithmetic/ExtendedBaseVector | 0m01.12s || +0m00.00s 0m00.96s | ModularArithmetic/BarrettReduction/Z | 0m01.41s || -0m00.44s 0m00.91s | ModularArithmetic/ModularBaseSystemField | 0m00.89s || +0m00.02s 0m00.81s | Testbit | 0m00.67s || +0m00.14s 0m00.80s | ModularArithmetic/ModularBaseSystemListProofs | 0m00.85s || -0m00.04s 0m00.77s | Experiments/SpecificCurve25519 | 0m00.77s || +0m00.00s 0m00.74s | Encoding/ModularWordEncodingTheorems | 0m00.71s || +0m00.03s 0m00.65s | ModularArithmetic/ExtPow2BaseMulProofs | 0m00.63s || +0m00.02s 0m00.64s | ModularArithmetic/ModularBaseSystemList | 0m00.59s || +0m00.05s 0m00.63s | Encoding/ModularWordEncodingPre | 0m00.92s || -0m00.29s 0m00.61s | Spec/ModularWordEncoding | 0m00.60s || +0m00.01s 0m00.61s | ModularArithmetic/Pre | 0m00.52s || +0m00.08s 0m00.60s | ModularArithmetic/PseudoMersenneBaseParamProofs | 0m00.58s || +0m00.02s 0m00.58s | ModularArithmetic/ModularBaseSystem | 0m00.55s || +0m00.02s 0m00.53s | ModularArithmetic/PseudoMersenneBaseParams | 0m00.53s || +0m00.00s 0m00.43s | ModularArithmetic/Pow2Base | 0m00.64s || -0m00.21s 0m00.36s | Spec/ModularArithmetic | 0m00.36s || +0m00.00s --- src/Util/ZUtil.v | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/Util/ZUtil.v b/src/Util/ZUtil.v index 30cb38857..939ada461 100644 --- a/src/Util/ZUtil.v +++ b/src/Util/ZUtil.v @@ -767,11 +767,7 @@ Module Z. | _ => let LHS := match goal with |- ?LHS <= ?RHS => LHS end in match LHS with | context G[?x * (?y / ?z)] - => lazymatch x with - | context[_ / _] => fail - | _ => idtac - end; - let G' := context G[(x * y) / z] in + => let G' := context G[(x * y) / z] in transitivity G' end end. -- cgit v1.2.3