Changeset 7b2b05 in git
- Timestamp:
- Aug 10, 2011, 5:59:04 PM (12 years ago)
- Branches:
- (u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
- 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
- Files:
-
- 4 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/silink.cc
r3b1d9a r7b2b05 700 700 == EOF) return TRUE; 701 701 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))) 703 703 == EOF) return TRUE; 704 704 if (fprintf(fd, "attrib(temp_ideal, \"isSB\", 1);\n") == EOF) return TRUE; … … 775 775 776 776 if ((type_id == RING_CMD || type_id == QRING_CMD) && 777 IDRING(h)-> minpoly != NULL)777 IDRING(h)->cf->type==n_algExt) 778 778 { 779 779 StringSetS(""); 780 nWrite(IDRING(h)-> minpoly);780 nWrite(IDRING(h)->cf->minpoly); 781 781 rhs = StringAppendS(""); 782 782 if (fprintf(fd, "; minpoly = %s", rhs) == EOF) return EOF; -
libpolys/polys/clapconv.h
r3b1d9a r7b2b05 15 15 16 16 #include <polys/monomials/ring.h> 17 #include <polys/ext_fields/longtrans.h>17 //#include <polys/ext_fields/longtrans.h> 18 18 #include <factory/factory.h> 19 19 -
libpolys/polys/clapsing.cc
r3b1d9a r7b2b05 25 25 #include "monomials/ring.h" 26 26 #include "simpleideals.h" 27 #include "ext_fields/transext.h" 27 28 //#include "polys.h" 28 29 … … 283 284 pIter(p); 284 285 } 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)); 287 288 288 289 // second run: gcd's … … 291 292 while ( (p != NULL) && (g != 1) && ( g != 0)) 292 293 { 293 h = convSingPFactoryP( ((lnumber)pGetCoeff(p))->z, r->cf->extRing );294 h = convSingPFactoryP( NUM(((fraction)pGetCoeff(p))), r->cf->extRing ); 294 295 pIter( p ); 295 296 … … 308 309 for ( i = L, p = f; i.hasItem(); i++, p=pNext(p) ) 309 310 { 310 lnumber c=(lnumber)pGetCoeff(p);311 p_Delete(& c->z,r->cf->extRing); // 2nd arg used to be nacRing312 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 ); 313 314 //nTest((number)c); 314 315 //#ifdef LDEBUG -
libpolys/polys/monomials/ring.cc
r3b1d9a r7b2b05 22 22 // #include <???/febase.h> 23 23 // #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> 26 26 // #include <coeffs/ffields.h> 27 27 #include <polys/monomials/ring.h>
Note: See TracChangeset
for help on using the changeset viewer.