Changeset 1d92bf in git

Timestamp:

May 8, 2012, 2:51:57 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fefaa8ebeb7a4ac9c586d3f248d03e8578febd79

Parents:

e699d86f1d122e6f33ebbdf5cd73abd7985274e2

git-author:

Martin Lee <martinlee84@web.de>2012-05-08 14:51:57+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-05-11 11:06:45+02:00

Message:

chg: deleted abs_fac outside of factory

File:

• Singular/extra.cc (modified) (2 diffs)

Singular/extra.cc

@@ -117 +117 @@
 #ifdef HAVE_SPECTRUM
 #include <kernel/spectrum.h>
-#endif
-
-#ifdef HAVE_BIFAC
-#include <bifac.h>
 #endif
 
@@ -3482 +3478 @@
       }
       else
-  /*==================== bifac =================*/
-  #ifdef HAVE_BIFAC
-      if (strcmp(sys_cmd, "bifac")==0)
-      {
-        if (h->Typ()!=POLY_CMD)
-        {
-          WerrorS("`system(\"bifac\",<poly>) expected");
-          return TRUE;
-        }
-        if (!rField_is_Q(currRing))
-        {
-          WerrorS("coeff field must be Q");
-          return TRUE;
-        }
-        BIFAC B;
-        CFFList C;
-        int sw_rat=isOn(SW_RATIONAL);
-        On(SW_RATIONAL);
-        CanonicalForm F( convSingPClapP((poly)(h->Data()), currRing));
-        B.bifac(F, 1);
-        CFFList L=B.getFactors();
-        // construct the ring ==============================================
-        int i;
-        int lev=ExtensionLevel();
-        char **names=(char**)omAlloc0(lev*sizeof(char_ptr));
-        for(i=1;i<=lev; i++)
-        {
-          StringSetS("");
-          names[i-1]=omStrDup(StringAppend("a(%d)",i));
-        }
-        ring alg_ring=rDefault(0,lev,names);
-        ring new_ring=rCopy0(currRing); // all variable names, ordering etc.
-        new_ring->P=lev;
-        new_ring->parameter=names;
-        new_ring->extRing=alg_ring;
-        new_ring->ch=1; // WTF!!??? :(
-        rComplete(new_ring,TRUE);
-        // set the mipo ===============================================
-        ring save_currRing=currRing; idhdl save_currRingHdl=currRingHdl;
-        rChangeCurrRing(alg_ring);
-        ideal mipo_id=idInit(lev,1);
-        for (i=lev; i>0;i--)
-        {
-          CanonicalForm Mipo=getMipo(Variable(-i),Variable(i));
-          mipo_id->m[i-1]=convClapPSingP(Mipo);
-        }
-        idShow(mipo_id);
-        alg_ring->qideal=mipo_id;
-        rChangeCurrRing(new_ring);
-        for (i=lev-1; i>=0;i--)
-        {
-          poly p=pOne();
-          lnumber n=(lnumber)pGetCoeff(p);
-          // no need to delete nac 1
-          n->z=(napoly)mipo_id->m[i];
-          mipo_id->m[i]=p;
-        }
-        new_ring->qideal=id_Copy(alg_ring->qideal,new_ring);
-        // convert factors =============================================
-        ideal fac_id=idInit(L.length(),1);
-        CFFListIterator J=L;
-        i=0;
-        intvec *v = new intvec( L.length() );
-        for ( ; J.hasItem(); J++,i++ )
-        {
-          fac_id->m[i]=convClapAPSingAP( J.getItem().factor() );
-          (*v)[i]=J.getItem().exp();
-        }
-        idhdl hh=enterid("factors",0,LIST_CMD,&(currRing->idroot),FALSE);
-        lists LL=(lists)omAllocBin( slists_bin);
-        LL->Init(2);
-        LL->m[0].rtyp=IDEAL_CMD;
-        LL->m[0].data=(char *)fac_id;
-        LL->m[1].rtyp=INTVEC_CMD;
-        LL->m[1].data=(char *)v;
-        IDDATA(hh)=(char *)LL;
-
-        rChangeCurrRing(save_currRing);
-        currRingHdl=save_currRingHdl;
-        if (!sw_rat) Off(SW_RATIONAL);
-
-        res->data=new_ring;
-        res->rtyp=RING_CMD;
-        return FALSE;
-      }
-      else
-  #endif
   /*==================== gcd-varianten =================*/
   #ifdef HAVE_FACTORY