Changeset 2d2c99c in git

Timestamp:

Mar 20, 2012, 4:30:55 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

3c0498bc95dd8c5ea36ad1a10baf29d12384fb79619d037962e428d4a002157d93e48cb0d12fc2d2

Parents:

823e1a54509e83cc2203b2bdde54b81bb025d770d42add3b64daed7b6de0cf1e38850fe2aafa1d42

Message:

Merge pull request #87 from mmklee/rSum_fix

R sum fix

File:

• libpolys/polys/monomials/ring.cc (modified) (3 diffs)

libpolys/polys/monomials/ring.cc

@@ -826 +826 @@
         r1->cf->ref++;
       }
-      else if ((getCoeffType (r2->cf)==n_algExt || getCoeffType (r2->cf)==n_transExt) && rChar(r2) == rChar(r1))
-      {
-        /*AlgExtInfo extParam;
-        extParam.r = r2->cf->extRing;
-        extParam.i = r2->cf->extRing->minideal;*/
+      else if (nCoeff_is_Extension(r2->cf) && rChar(r2) == rChar(r1))
+      {
         tmpR.cf=r2->cf;
         r2->cf->ref++;
@@ -852 +849 @@
         r2->cf->ref++;
       }
-      else if (getCoeffType(r2->cf)==n_algExt || getCoeffType(r2->cf)==n_transExt)
+      else if (nCoeff_is_Extension(r2->cf))
       {
         tmpR.cf=r2->cf;
@@ -860 +857 @@
       {
         WerrorS("Q+...");
+        return -1;
+      }
+    }
+    else if (nCoeff_is_Extension(r1->cf))
+    {
+      if (r1->cf->extRing->cf==r2->cf)
+      {
+        tmpR.cf=r1->cf;
+        r1->cf->ref++;
+      }
+      else if (getCoeffType(r1->cf->extRing->cf)==n_Zp && getCoeffType(r2->cf)==n_Q) //r2->cf == n_Zp should have been handled above
+      {
+        tmpR.cf=r1->cf;
+        r1->cf->ref++;
+      }
+      else
+      {
+        WerrorS ("coeff sum of two extension fields not implemented");
         return -1;
       }