Changeset 7b2b05 in git


Ignore:
Timestamp:
Aug 10, 2011, 5:59:04 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
072660924afb50e548220c7b6d431008d9d10d80
Parents:
3b1d9ad2203f374c5bb63a847f440d4759cd47c2
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-10 17:59:04+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:19:11+01:00
Message:
removed longalg.*, longtrans.* (we use now algext.*, transext.*)
Files:
4 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • Singular/silink.cc

    r3b1d9a r7b2b05  
    700700              == EOF) return TRUE;
    701701  if (fprintf(fd, "%s temp_ideal = %s;\n", Tok2Cmdname(IDEAL_CMD),
    702               iiStringMatrix((matrix) IDRING(h)->qideal, 1))
     702              iiStringMatrix((matrix) IDRING(h)->qideal, 1, currRing, n_GetChar(currRing->cf)))
    703703      == EOF) return TRUE;
    704704  if (fprintf(fd, "attrib(temp_ideal, \"isSB\", 1);\n") == EOF) return TRUE;
     
    775775
    776776    if ((type_id == RING_CMD || type_id == QRING_CMD) &&
    777         IDRING(h)->minpoly != NULL)
     777        IDRING(h)->cf->type==n_algExt)
    778778    {
    779779      StringSetS("");
    780       nWrite(IDRING(h)->minpoly);
     780      nWrite(IDRING(h)->cf->minpoly);
    781781      rhs = StringAppendS("");
    782782      if (fprintf(fd, "; minpoly = %s", rhs) == EOF) return EOF;
  • libpolys/polys/clapconv.h

    r3b1d9a r7b2b05  
    1515
    1616#include <polys/monomials/ring.h>
    17 #include <polys/ext_fields/longtrans.h>
     17//#include <polys/ext_fields/longtrans.h>
    1818#include <factory/factory.h>
    1919
  • libpolys/polys/clapsing.cc

    r3b1d9a r7b2b05  
    2525#include "monomials/ring.h"
    2626#include "simpleideals.h"
     27#include "ext_fields/transext.h"
    2728//#include "polys.h"
    2829
     
    283284      pIter(p);
    284285    }
    285     g = convSingPFactoryP( ((lnumber)g1)->z, r->cf->extRing );
    286     g = gcd( g, convSingPFactoryP( ((lnumber)g2)->z , r->cf->extRing));
     286    g = convSingPFactoryP( NUM(((fraction)g1)), r->cf->extRing );
     287    g = gcd( g, convSingPFactoryP( NUM(((fraction)g2)) , r->cf->extRing));
    287288
    288289    // second run: gcd's
     
    291292    while ( (p != NULL) && (g != 1)  && ( g != 0))
    292293    {
    293       h = convSingPFactoryP( ((lnumber)pGetCoeff(p))->z, r->cf->extRing );
     294      h = convSingPFactoryP( NUM(((fraction)pGetCoeff(p))), r->cf->extRing );
    294295      pIter( p );
    295296
     
    308309      for ( i = L, p = f; i.hasItem(); i++, p=pNext(p) )
    309310      {
    310         lnumber c=(lnumber)pGetCoeff(p);
    311         p_Delete(&c->z,r->cf->extRing); // 2nd arg used to be nacRing
    312         c->z=convFactoryPSingP( i.getItem() / g, r->cf->extRing );
     311        fraction c=(fraction)pGetCoeff(p);
     312        p_Delete(&(NUM(c)),r->cf->extRing); // 2nd arg used to be nacRing
     313        NUM(c)=convFactoryPSingP( i.getItem() / g, r->cf->extRing );
    313314        //nTest((number)c);
    314315        //#ifdef LDEBUG
  • libpolys/polys/monomials/ring.cc

    r3b1d9a r7b2b05  
    2222// #include <???/febase.h>
    2323// #include <???/intvec.h>
    24 #include <polys/ext_fields/longalg.h>
    25 #include <polys/ext_fields/longtrans.h>
     24//#include <polys/ext_fields/longalg.h>
     25//#include <polys/ext_fields/longtrans.h>
    2626// #include <coeffs/ffields.h>
    2727#include <polys/monomials/ring.h>
Note: See TracChangeset for help on using the changeset viewer.