Changeset ea83e2 in git
- Timestamp:
- May 12, 2014, 12:25:28 PM (10 years ago)
- Branches:
- (u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')
- Children:
- 3209bae2dcdc0e8fbd67b5e4e87d19f738b16405
- Parents:
- 3b2cf5b56ef125d3f679b267b4887424d18ed5ad
- git-author:
- Martin Lee <martinlee84@web.de>2014-05-12 12:25:28+02:00
- git-committer:
- Martin Lee <martinlee84@web.de>2014-05-12 14:35:03+02:00
- Location:
- factory
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
factory/cfCharSets.cc
r3b2cf5 rea83e2 609 609 { 610 610 nr_of_iteration += 1; 611 ppi= MyUnion (ListCFList (qs), ppi1);611 ppi= MyUnion (ListCFList (qs), ppi1); 612 612 } 613 613 -
factory/facAlgFunc.cc
r3b2cf5 rea83e2 177 177 178 178 static CanonicalForm 179 resultante ( const CanonicalForm & f, const CanonicalForm& g, const Variable & v)179 resultante (const CanonicalForm & f, const CanonicalForm& g, const Variable & v) 180 180 { 181 181 bool on_rational = isOn(SW_RATIONAL); … … 243 243 for (i= testlist; i.hasItem(); i++) 244 244 { 245 if (i.getItem().exp() > 1 && degree (i.getItem().factor(), 245 if (i.getItem().exp() > 1 && degree (i.getItem().factor(),R.mvar()) > 0) 246 246 { 247 247 sqfreetest= 0; … … 291 291 // K must have more than S elements (-> getDegOfExt) 292 292 static CFList 293 simpleExtension (CFList& backSubst, const CFList & Astar,294 const Variable & Extension, bool& isFunctionField,295 CanonicalForm & R)293 simpleExtension (CFList& backSubst, const CFList & Astar, 294 const Variable & Extension, bool& isFunctionField, 295 CanonicalForm & R) 296 296 { 297 297 CFList Returnlist, Bstar= Astar; … … 379 379 for (; j.hasItem(); j++) 380 380 { 381 CanonicalForm powdenra= power (denra, degree (j.getItem(), oldR.mvar())); 381 CanonicalForm powdenra= power (denra, degree (j.getItem(), 382 oldR.mvar())); 382 383 j.getItem()= evaluate (j.getItem(),ra, denra, powdenra, oldR.mvar()); 383 384 powdenra= power (denra, degree (j.getItem(), i.getItem().mvar())); 384 j.getItem()= evaluate (j.getItem(), rb, denrb, powdenra, i.getItem().mvar()); 385 j.getItem()= evaluate (j.getItem(), rb, denrb, powdenra, 386 i.getItem().mvar()); 385 387 } 386 388 } … … 415 417 CFList substlist, backSubsts; 416 418 417 substlist= simpleExtension (backSubsts, Astar, vminpoly, isFunctionField, Rstar); 419 substlist= simpleExtension (backSubsts, Astar, vminpoly, isFunctionField, 420 Rstar); 418 421 419 422 f= subst (f, Astar, substlist, Rstar, isFunctionField); … … 693 696 tmp= varsGMap[j]; 694 697 CFFListIterator iter2= varsGMapLevel; 695 ASSERT (tmp.length() == varsGMapLevel.length(), "wrong length of lists"); 698 ASSERT (tmp.length() == varsGMapLevel.length(), 699 "wrong length of lists"); 696 700 for (iter=tmp; iter.hasItem(); iter++, iter2++) 697 701 iter.getItem()= CFFactor (iter.getItem().factor(), -
factory/facAlgFuncUtil.cc
r3b2cf5 rea83e2 85 85 } 86 86 87 /////////////////////////////////////////////////////////////// 88 // generate a minpoly of degree degree_of_Extension in the // 89 // field getCharacteristik()^Extension. // 90 /////////////////////////////////////////////////////////////// 87 // generate an irreducible poly of degree degOfExt over F_p 91 88 CanonicalForm 92 89 generateMipo (int degOfExt) … … 95 92 return find_irreducible (degOfExt, gen, Variable (1)); 96 93 } 97 98 ////////////////////////////////////////////////////////////////////////99 // This implements the algorithm of Trager for factorization of100 // (multivariate) polynomials over algebraic extensions and so called101 // function field extensions.102 ////////////////////////////////////////////////////////////////////////103 94 104 95 // // missing class: IntGenerator: … … 523 514 } 524 515 525 // Look if Minimalpolynomials in Astar define seperable Extensions 526 // Must be a power of p: i.e. y^{p^e}-x 516 // check if polynomials in Astar define a separable extension 527 517 bool 528 isInseparable (const CFList & Astar)518 isInseparable (const CFList & Astar) 529 519 { 530 520 CanonicalForm elem; … … 542 532 543 533 // calculate big enough extension for finite fields 544 // Idea: first calculate k, such that q^k > S (->thesis , -> getextension)534 // Idea: first calculate k, such that q^k > S (->thesis) 545 535 // Second, search k with gcd(k,m_i)=1, where m_i is the degree of the i'th 546 536 // minimal polynomial. Then the minpoly f_i remains irrd. over q^k and we … … 636 626 637 627 CanonicalForm 638 evaluate (const CanonicalForm& f, const CanonicalForm& g, const CanonicalForm& h,639 const CanonicalForm& powH)628 evaluate (const CanonicalForm& f, const CanonicalForm& g, 629 const CanonicalForm& h, const CanonicalForm& powH) 640 630 { 641 631 if (f.inCoeffDomain())
Note: See TracChangeset
for help on using the changeset viewer.