This fixes #48

PoslavskySV · Sep 16, 2018 · 004c718 · 004c718
1 parent e960bcd
commit 004c718
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 3 deletions.
diff --git a/rings/src/main/java/cc/redberry/rings/poly/univar/AUnivariatePolynomial64.java b/rings/src/main/java/cc/redberry/rings/poly/univar/AUnivariatePolynomial64.java
@@ -482,6 +482,8 @@ public final lPoly increment() {
 
     @Override
     public final lPoly add(lPoly oth) {
+        assertSameCoefficientRingWith(oth);
+
         if (oth.isZero())
             return self;
         if (isZero())
@@ -520,6 +522,8 @@ public final lPoly addMonomial(long coefficient, int exponent) {
      * @return {@code this + oth * factor} modulo {@code modulus}
      */
     public final lPoly addMul(lPoly oth, long factor) {
+        assertSameCoefficientRingWith(oth);
+
         if (oth.isZero())
             return self;
 
@@ -537,6 +541,8 @@ public final lPoly addMul(lPoly oth, long factor) {
 
     @Override
     public final lPoly subtract(lPoly oth) {
+        assertSameCoefficientRingWith(oth);
+
         if (oth.isZero())
             return self;
         if (isZero())
@@ -559,6 +565,8 @@ public final lPoly subtract(lPoly oth) {
      * @return {@code this - factor * x^exponent * oth}
      */
     public final lPoly subtract(lPoly oth, long factor, int exponent) {
+        assertSameCoefficientRingWith(oth);
+
         if (oth.isZero())
             return self;
 

diff --git a/rings/src/main/java/cc/redberry/rings/poly/univar/IrreduciblePolynomials.java b/rings/src/main/java/cc/redberry/rings/poly/univar/IrreduciblePolynomials.java
@@ -32,7 +32,7 @@ public static <Poly extends IUnivariatePolynomial<Poly>> boolean irreducibleQ(Po
         if (poly.isOverFiniteField())
             return finiteFieldIrreducibleQ(poly);
         else
-            return UnivariateFactorization.Factor(poly).isTrivial();
+            return !poly.isMonomial() && UnivariateFactorization.Factor(poly).isTrivial();
     }
 
     /**
@@ -55,6 +55,9 @@ public static <Poly extends IUnivariatePolynomial<Poly>> boolean finiteFieldIrre
     finiteFieldIrreducibleViaModularComposition(Poly poly) {
         Util.ensureOverFiniteField(poly);
 
+        if (poly.isMonomial())
+            return false;
+
         if (canConvertToZp64(poly))
             return finiteFieldIrreducibleViaModularComposition(asOverZp64(poly));
 
@@ -129,6 +132,9 @@ static <Poly extends IUnivariatePolynomial<Poly>> Poly composition(
     finiteFieldIrreducibleBenOr(Poly poly) {
         Util.ensureOverFiniteField(poly);
 
+        if (poly.isMonomial())
+            return false;
+
         if (canConvertToZp64(poly))
             return finiteFieldIrreducibleBenOr(asOverZp64(poly));
 

diff --git a/rings/src/main/java/cc/redberry/rings/poly/univar/UnivariatePolynomial.java b/rings/src/main/java/cc/redberry/rings/poly/univar/UnivariatePolynomial.java
@@ -839,6 +839,8 @@ public UnivariatePolynomial<E> increment() {
 
     @Override
     public UnivariatePolynomial<E> add(UnivariatePolynomial<E> oth) {
+        assertSameCoefficientRingWith(oth);
+
         if (oth.isZero())
             return this;
         if (isZero())
@@ -877,6 +879,8 @@ public UnivariatePolynomial<E> addMonomial(E coefficient, int exponent) {
      * @return {@code this + oth * factor} modulo {@code modulus}
      */
     public UnivariatePolynomial<E> addMul(UnivariatePolynomial<E> oth, E factor) {
+        assertSameCoefficientRingWith(oth);
+
         if (oth.isZero())
             return this;
 
@@ -894,6 +898,8 @@ public UnivariatePolynomial<E> addMul(UnivariatePolynomial<E> oth, E factor) {
 
     @Override
     public UnivariatePolynomial<E> subtract(UnivariatePolynomial<E> oth) {
+        assertSameCoefficientRingWith(oth);
+
         if (oth.isZero())
             return this;
         if (isZero())
@@ -916,6 +922,8 @@ public UnivariatePolynomial<E> subtract(UnivariatePolynomial<E> oth) {
      * @return {@code this - factor * x^exponent * oth}
      */
     public UnivariatePolynomial<E> subtract(UnivariatePolynomial<E> oth, E factor, int exponent) {
+        assertSameCoefficientRingWith(oth);
+
         if (oth.isZero())
             return this;
 
@@ -1048,6 +1056,8 @@ public UnivariatePolynomial<E> multiplyByBigInteger(BigInteger factor) {
     @Override
     @SuppressWarnings("unchecked")
     public UnivariatePolynomial<E> multiply(UnivariatePolynomial<E> oth) {
+        assertSameCoefficientRingWith(oth);
+
         if (isZero())
             return this;
         if (oth.isZero())

diff --git a/rings/src/main/java/cc/redberry/rings/poly/univar/UnivariatePolynomialZp64.java b/rings/src/main/java/cc/redberry/rings/poly/univar/UnivariatePolynomialZp64.java
@@ -415,6 +415,8 @@ public UnivariatePolynomialZp64 multiplyByBigInteger(BigInteger factor) {
 
     @Override
     public UnivariatePolynomialZp64 multiply(UnivariatePolynomialZp64 oth) {
+        assertSameCoefficientRingWith(oth);
+
         if (isZero())
             return this;
         if (oth.isZero())

diff --git a/rings/src/test/java/cc/redberry/rings/poly/multivar/MultivariateResultantsTest.java b/rings/src/test/java/cc/redberry/rings/poly/multivar/MultivariateResultantsTest.java
@@ -71,7 +71,8 @@ public void testBrown1_random() throws Exception {
             brown.addValue(System.nanoTime() - start);
 
             SingularResult<MonomialZp64, MultivariatePolynomialZp64> expected = SingularResultant(a, b, variable);
-            singular.addValue(expected.nanotime);
+            if (expected != null)
+                singular.addValue(expected.nanotime);
 
             assertEquals(expected.resultant, actual);
         }

diff --git a/rings/src/test/java/cc/redberry/rings/poly/univar/UnivariateFactorizationTest.java b/rings/src/test/java/cc/redberry/rings/poly/univar/UnivariateFactorizationTest.java
@@ -509,7 +509,7 @@ public void testNumberField3_random() {
                     .mapCoefficients(Q, cf -> Q.mkNumerator(cf.mod(10)));
 
             minimalPoly.setLC(Q.mkNumerator(rndd.nextInt(1, 10)));
-            if (!IrreduciblePolynomials.irreducibleQ(minimalPoly)) {
+            if (minimalPoly.isMonomial() || !IrreduciblePolynomials.irreducibleQ(minimalPoly)) {
                 --i;
                 continue;
             }