Skip to content

Commit

Permalink
Remove LinearlyExplicitOver Integer from SingleInteger
Browse files Browse the repository at this point in the history
git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@2101 b0c55286-4f34-0410-a049-a1e7e93b0762
  • Loading branch information
hebisch committed Sep 6, 2016
1 parent 7bdbf85 commit 99c4d21
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2016-02-06 Waldek Hebisch <hebisch@math.uni.wroc.pl>

* src/algebra/si.spad: Remove LinearlyExplicitOver Integer
from SingleInteger
src/algebra/integer.spad: Adjust

2016-02-04 Waldek Hebisch <hebisch@math.uni.wroc.pl>

* src/interp/category.boot, src/interp/info.boot,
Expand Down
5 changes: 3 additions & 2 deletions src/algebra/integer.spad
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ IntegerSolveLinearPolynomialEquation() : C ==T
++ Description: \spadtype{Integer} provides the domain of arbitrary precision
++ integers.

Integer : Join(IntegerNumberSystem, ConvertibleTo String, OpenMath, _
PolynomialFactorizationExplicit, Canonical, canonicalsClosed) with
Integer : Join(IntegerNumberSystem, LinearlyExplicitOver Integer,
PolynomialFactorizationExplicit, ConvertibleTo String,
OpenMath, Canonical, canonicalsClosed) with
random : % -> %
++ random(n) returns a random integer from 0 to \spad{n-1}.
== add
Expand Down
6 changes: 1 addition & 5 deletions src/algebra/si.spad
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
IntegerNumberSystem() : Category ==
Join(UniqueFactorizationDomain, EuclideanDomain, OrderedIntegralDomain,
DifferentialRing, ConvertibleTo Integer, RetractableTo Integer,
LinearlyExplicitOver Integer, ConvertibleTo InputForm,
ConvertibleTo InputForm,
ConvertibleTo Pattern Integer, PatternMatchable Integer,
CombinatorialFunctionCategory, RealConstant,
CharacteristicZero, StepThrough, canonicalUnitNormal,
Expand Down Expand Up @@ -216,7 +216,6 @@ SingleInteger() : Join(IntegerNumberSystem, ConvertibleTo String,
if wholeObj then
OMputEndObject(dev)

reducedSystem m == m pretend Matrix(Integer)
coerce(x) : OutputForm == (convert(x)@Integer)::OutputForm
convert(x : %) : Integer == x pretend Integer
convert(x : %) : String == string(convert(x)@Integer)
Expand Down Expand Up @@ -263,9 +262,6 @@ SingleInteger() : Join(IntegerNumberSystem, ConvertibleTo String,
negative?(x) == negative?_SI$Lisp x


reducedSystem(m, v) ==
[m pretend Matrix(Integer), v pretend Vector(Integer)]

positiveRemainder(x, n) ==
r : % := rem_SI(x, n)$Lisp
negative?_SI(r)$Lisp =>
Expand Down

0 comments on commit 99c4d21

Please sign in to comment.