Changeset dad9fb in git for libpolys/polys/monomials

Timestamp:

Mar 15, 2012, 5:26:46 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8066cd9340c30bf555310cdb3ca4a9c82b4f3e92a82c308b8fbf35f5d32c156ead224188e2610f7e

Parents:

788fdfc919bcf38d8b469a0f59374abf9046985dd841a16156c2e0b2a5e731384a7a5e454dffe2d8

Message:

Merge pull request #82 from mmklee/bug_fixes_sw

Bug fixes sw

Location:

libpolys/polys/monomials

Files:

• p_polys.cc (modified) (1 diff)
• p_polys.h (modified) (1 diff)
• ring.cc (modified) (2 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -3414 +3414 @@
        return NULL;
 
-    if( !DENIS1(z) )
-      WarnS("Not implemented yet: Cannot permute a rational fraction and make a polynomial out of it! Ignorring the denumerator.");
+    //if( !DENIS1(z) )
+      //WarnS("Not implemented yet: Cannot permute a rational fraction and make a polynomial out of it! Ignorring the denumerator.");
   } else
      {

libpolys/polys/monomials/p_polys.h

@@ -437 +437 @@
     switch(r->typ[i].ord_typ)
     {
+      case ro_am:
       case ro_wp_neg:
         return (((long)((p)->exp[r->pOrdIndex]))-POLY_NEGWEIGHT_OFFSET);

libpolys/polys/monomials/ring.cc

@@ -795 +795 @@
         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;*/
+        tmpR.cf=r2->cf;
+        r2->cf->ref++;
+      }
       else
       {
@@ -809 +817 @@
     {
       if (getCoeffType(r2->cf)==n_Zp)
+      {
+        tmpR.cf=r2->cf;
+        r2->cf->ref++;
+      }
+      else if (getCoeffType(r2->cf)==n_algExt || getCoeffType(r2->cf)==n_transExt)
       {
         tmpR.cf=r2->cf;