Skip to content

Commit 9b39beb

Browse files
committed
Revert "Merge branch 'fast-int-with-pl-and-ocr-instances' into ocr+pl-instances"
This reverts commit 47725ea, reversing changes made to 561308e.
1 parent 47725ea commit 9b39beb

File tree

15 files changed

+19
-2503
lines changed

15 files changed

+19
-2503
lines changed

Cubical/Algebra/AbGroup/Instances/Int/Fast.agda

Lines changed: 0 additions & 9 deletions
This file was deleted.

Cubical/Algebra/CommRing/Instances/Int/Fast.agda

Lines changed: 0 additions & 23 deletions
This file was deleted.

Cubical/Algebra/Group/Instances/Int/Fast.agda

Lines changed: 0 additions & 56 deletions
This file was deleted.

Cubical/Data/Int/Base.agda

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ abs : ℤ → ℕ
4242
abs (pos n) = n
4343
abs (negsuc n) = suc n
4444

45-
sign :
46-
sign (pos zero) = pos zero
47-
sign (pos (suc n)) = pos (suc zero)
48-
sign (negsuc n) = negsuc zero
49-
5045
_ℕ-_ :
5146
a ℕ- 0 = pos a
5247
0 ℕ- suc b = negsuc b

Cubical/Data/Int/Fast.agda

Lines changed: 0 additions & 6 deletions
This file was deleted.

Cubical/Data/Int/Fast/Base.agda

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ module Cubical.Data.Int.Fast.Base where
22

33
open import Cubical.Foundations.Prelude
44
open import Cubical.Data.Nat as ℕ hiding (_+_ ; _·_)
5-
open import Cubical.Data.Int.Base hiding (_ℕ-_ ; _+_ ; _-_ ; _·_ ; sumFinℤ ; sumFinℤId) public
6-
open import Cubical.Data.Fin.Inductive.Base
5+
open import Cubical.Data.Int.Base hiding (_ℕ-_ ; _+_ ; _-_ ; _·_) public
76

87
infixl 7 _·_
98
infixl 6 _+_ _-_
@@ -16,25 +15,18 @@ _ℕ-_ : ℕ → ℕ → ℤ
1615
m ℕ- n = ℕ-hlp (m ℕ.∸ n) (n ℕ.∸ m)
1716

1817
_+_ :
19-
pos m + pos n = pos (m ℕ.+ n)
20-
negsuc m + negsuc n = negsuc (suc (m ℕ.+ n))
21-
pos m + negsuc n = m ℕ- (suc n)
22-
negsuc m + pos n = n ℕ- (suc m)
18+
pos n + pos n= pos (n ℕ.+ n)
19+
negsuc n + negsuc n = negsuc (suc (n ℕ.+ n))
20+
pos n + negsuc n = n ℕ- (suc n)
21+
negsuc n + pos n= n ℕ- (suc n)
2322

2423
_-_ :
2524
m - n = m + (- n)
2625

2726
_·_ :
28-
pos m · pos n = pos (m ℕ.· n)
29-
pos zero · negsuc n = pos zero
30-
pos (suc m) · negsuc n = negsuc (predℕ (suc m ℕ.· suc n))
31-
negsuc m · pos zero = pos zero
32-
negsuc m · pos (suc n) = negsuc (predℕ (suc m ℕ.· suc n))
33-
negsuc m · negsuc n = pos (suc m ℕ.· suc n)
34-
35-
sumFinℤ : {n : ℕ} (f : Fin n ℤ)
36-
sumFinℤ {n = n} f = sumFinGen {n = n} _+_ 0 f
37-
38-
sumFinℤId : (n : ℕ) {f g : Fin n ℤ}
39-
((x : _) f x ≡ g x) sumFinℤ {n = n} f ≡ sumFinℤ {n = n} g
40-
sumFinℤId n t i = sumFinℤ {n = n} λ x t x i
27+
pos n · pos n₁ = pos (n ℕ.· n₁)
28+
pos zero · negsuc n₁ = pos zero
29+
pos (suc n) · negsuc n₁ = negsuc (predℕ (suc n ℕ.· suc n₁))
30+
negsuc n · pos zero = pos zero
31+
negsuc n · pos (suc n₁) = negsuc (predℕ (suc n ℕ.· suc n₁))
32+
negsuc n · negsuc n₁ = pos (suc n ℕ.· suc n₁)

0 commit comments

Comments
 (0)