Changeset c10f46 in git for factory/libfac/charset/alg_factor.cc

Timestamp:

Aug 3, 2012, 1:06:22 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

b0732eb4254fbe76540d72c337f3d7f985adf948

Parents:

b8610796eaca5ba7db8dc75f8bc88d698e077b365abb0e7fdca82a2bad9778e410148c74d7b49a0b

Message:

Merge pull request #162 from steenpass/libs

changes in LIBs from master

File:

• factory/libfac/charset/alg_factor.cc (modified) (29 diffs)

factory/libfac/charset/alg_factor.cc

@@ -2 +2 @@
 // emacs edit mode for this file is -*- C++ -*-
 ////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
+
 // FACTORY - Includes
 #include <factory.h>
@@ -18 +18 @@
 #include "alg_factor.h"
 
-void out_cf(char *s1,const CanonicalForm &f,char *s2);
+void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
 
 #ifdef ALGFACTORDEBUG
@@ -80 +80 @@
 // replacement for factory's broken psr
 static CanonicalForm
-mypsr ( const CanonicalForm &rr, const CanonicalForm &vv, const Variable & x ){
+mypsr ( const CanonicalForm &rr, const CanonicalForm &vv, const Variable & x )
+{
   CanonicalForm r=rr, v=vv, l, test, lu, lv, t, retvalue;
   int dr, dv, d,n=0;
@@ -104 +105 @@
 // replacement for factory's broken resultant
 static CanonicalForm
-resultante( const CanonicalForm & f, const CanonicalForm& g, const Variable & v ){
+resultante( const CanonicalForm & f, const CanonicalForm& g, const Variable & v )
+{
   bool on_rational = isOn(SW_RATIONAL);
   On(SW_RATIONAL);
@@ -113 +115 @@
   if (!on_rational)  Off(SW_RATIONAL);
 
-return resultant(fz,gz,v);
+  return resultant(fz,gz,v);
 }
 
@@ -133 +135 @@
 sqrf_norm_sub( const CanonicalForm & f, const CanonicalForm & PPalpha,
            CFGenerator & myrandom, CanonicalForm & s,  CanonicalForm & g,
-           CanonicalForm & R){
+           CanonicalForm & R)
+{
   Variable y=PPalpha.mvar(),vf=f.mvar();
   CanonicalForm temp, Palpha=PPalpha, t;
@@ -147 +150 @@
 
   // Norm, resultante taken with respect to y
-  while ( !sqfreetest ){
+  while ( !sqfreetest )
+  {
     DEBOUTLN(CERR, "sqrf_norm_sub: Palpha= ", Palpha);
     R = resultante(Palpha, g, y); R= R* bCommonDen(R);
@@ -160 +164 @@
       DEBOUTLN(CERR, "sqrf_norm_sub: sqfreetest= ", sqfreetest);
     }
-    else{
+    else
+    {
       DEBOUTMSG(CERR, "Starting SqrFreeTest(R)!");
       // Look at SqrFreeTest!
@@ -169 +174 @@
       if (getAlgVar(R,X))
       {
-        if (R.isUnivariate())
           testlist=factorize( R, X );
-        else
-          testlist= Factorize(R, X, 0);
       }
       else
@@ -183 +185 @@
       DEBOUTLN(CERR, "SqrFreeTest(R)= ", sqfreetest);
     }
-    if ( ! sqfreetest ){
+    if ( ! sqfreetest )
+    {
       myrandom.next();
       DEBOUTLN(CERR, "sqrf_norm_sub generated new myrandom item: ", myrandom.item());
@@ -198 +201 @@
 sqrf_agnorm_sub( const CanonicalForm & f, const CanonicalForm & PPalpha,
            AlgExtGenerator & myrandom, CanonicalForm & s,  CanonicalForm & g,
-           CanonicalForm & R){
+           CanonicalForm & R)
+{
   Variable y=PPalpha.mvar(),vf=f.mvar();
   CanonicalForm temp, Palpha=PPalpha, t;
@@ -212 +216 @@
 
   // Norm, resultante taken with respect to y
-  while ( !sqfreetest ){
+  while ( !sqfreetest )
+  {
     DEBOUTLN(CERR, "sqrf_norm_sub: Palpha= ", Palpha);
     R = resultante(Palpha, g, y); R= R* bCommonDen(R);
@@ -225 +230 @@
       DEBOUTLN(CERR, "sqrf_norm_sub: sqfreetest= ", sqfreetest);
     }
-    else{
+    else
+    {
       DEBOUTMSG(CERR, "Starting SqrFreeTest(R)!");
       // Look at SqrFreeTest!
@@ -234 +240 @@
       if (getAlgVar(R,X))
       {
-        if (R.isUnivariate())
           testlist=factorize( R, X );
-        else
-          testlist= Factorize(R, X, 0);
       }
       else
@@ -248 +251 @@
       DEBOUTLN(CERR, "SqrFreeTest(R)= ", sqfreetest);
     }
-    if ( ! sqfreetest ){
+    if ( ! sqfreetest )
+    {
       myrandom.next();
       DEBOUTLN(CERR, "sqrf_norm_sub generated new myrandom item: ", myrandom.item());
@@ -264 +268 @@
 sqrf_norm( const CanonicalForm & f, const CanonicalForm & PPalpha,
            const Variable & Extension, CanonicalForm & s,  CanonicalForm & g,
-           CanonicalForm & R){
-
+           CanonicalForm & R)
+{
   DEBOUTLN(CERR, "sqrf_norm:      f= ", f);
   DEBOUTLN(CERR, "sqrf_norm: Palpha= ", PPalpha);
-  if ( getCharacteristic() == 0 ) {
+  if ( getCharacteristic() == 0 )
+  {
     IntGenerator myrandom;
     DEBOUTMSG(CERR, "sqrf_norm: no extension, char=0");
@@ -278 +283 @@
     DEBOUTLN(CERR, "sqrf_norm:      R= ", R);
   }
-  else if ( degree(Extension) > 0 ){ // working over Extensions
+  else if ( degree(Extension) > 0 ) // working over Extensions
+  {
     DEBOUTLN(CERR, "sqrf_norm: degree of extension is ", degree(Extension));
     AlgExtGenerator myrandom(Extension);
     sqrf_agnorm_sub(f,PPalpha, myrandom, s,g,R);
   }
-  else{
+  else
+  {
     FFGenerator myrandom;
     DEBOUTMSG(CERR, "sqrf_norm: degree of extension is 0");
@@ -296 +303 @@
   Variable x;
 
-  for ( VarlistIterator i=uord; i.hasItem(); i++){
+  for ( VarlistIterator i=uord; i.hasItem(); i++)
+  {
     x=i.getItem();
-    for ( CFListIterator j=Astar; j.hasItem(); j++ ){
+    for ( CFListIterator j=Astar; j.hasItem(); j++ )
+    {
       elem= j.getItem();
-      if ( degree(elem,x) > 0 ){ // x actually occures in Astar
+      if ( degree(elem,x) > 0 ) // x actually occures in Astar
+      {
         output.append(x);
         break;
@@ -312 +322 @@
 // Must be a power of p: i.e. y^{p^e}-x
 static int
-inseperable(const CFList & Astar){
+inseperable(const CFList & Astar)
+{
   CanonicalForm elem;
   int Counter= 1;
 
   if ( Astar.length() == 0 ) return 0;
-  for ( CFListIterator i=Astar; i.hasItem(); i++){
+  for ( CFListIterator i=Astar; i.hasItem(); i++)
+  {
     elem= i.getItem();
     if ( elem.deriv() == elem.genZero() ) return Counter;
@@ -327 +339 @@
 // calculate gcd of f and g in char=0
 static CanonicalForm
-gcd0( CanonicalForm f, CanonicalForm g ){
+gcd0( CanonicalForm f, CanonicalForm g )
+{
   int charac= getCharacteristic();
   int save=isOn(SW_RATIONAL);
@@ -333 +346 @@
   CanonicalForm ff= mapinto(f), gg= mapinto(g);
   CanonicalForm result= gcd(ff,gg);
-  setCharacteristic(charac); 
+  setCharacteristic(charac);
   if (save) On(SW_RATIONAL);
   return mapinto(result);
@@ -344 +357 @@
 // have enough elements to plug in.
 static int
-getextension( IntList & degreelist, int n){
+getextension( IntList & degreelist, int n)
+{
   int charac= getCharacteristic();
   setCharacteristic(0); // need it for k !
@@ -543 +557 @@
 
 static CFFList
-endler( const CanonicalForm & f, const CFList & AS, const Varlist & uord ){
+endler( const CanonicalForm & f, const CFList & AS, const Varlist & uord )
+{
   CanonicalForm F=f, g, q,r;
   CFFList Output;
@@ -551 +566 @@
   Variable vg;
 
-  for (i=as; i.hasItem(); i++){
+  for (i=as; i.hasItem(); i++)
+  {
     g= i.getItem();
-    if (g.deriv() == 0 ){
+    if (g.deriv() == 0 )
+    {
       DEBOUTLN(CERR, "Inseperable extension detected: ", g);
-      for (j=uord; j.hasItem(); j++){
+      for (j=uord; j.hasItem(); j++)
+      {
         if ( degree(g,j.getItem()) > 0 ) vg= j.getItem();
       }
@@ -568 +586 @@
       // Now transform all remaining polys in as:
       int x=0;
-      for (ii=i; ii.hasItem(); ii++){
-        if ( x != 0 ){
+      for (ii=i; ii.hasItem(); ii++)
+      {
+        if ( x != 0 )
+        {
           divrem(ii.getItem(), gg, q,r);
 //          CERR << ii.getItem() << " divided by " << gg << "\n";
@@ -595 +615 @@
 
   // Transform back:
-  for ( CFFListIterator k=factorlist; k.hasItem(); k++){
+  for ( CFFListIterator k=factorlist; k.hasItem(); k++)
+  {
     CanonicalForm factor= k.getItem().factor();
     ii=One;
-    for (i=Two; i.hasItem(); i++){
+    for (i=Two; i.hasItem(); i++)
+    {
       DEBOUTLN(CERR, "Mapping ", i.getItem());
       DEBOUTLN(CERR, "     to ", ii.getItem());
@@ -618 +640 @@
 //           no transcendentals, seperable and inseperable extensions
 CFFList
-newfactoras( const CanonicalForm & f, const CFList & as, int &success){
+newfactoras( const CanonicalForm & f, const CFList & as, int &success)
+{
   Variable vf=f.mvar();
   CFListIterator i;
@@ -751 +774 @@
 
 CFFList
-newcfactor(const CanonicalForm & f, const CFList & as, int & success ){
+newcfactor(const CanonicalForm & f, const CFList & as, int & success )
+{
   Off(SW_RATIONAL);
-  CFFList Output, output, Factors=Factorize(f); On(SW_RATIONAL);
+  CFFList Output, output, Factors=Factorize(f);
+  On(SW_RATIONAL);
   Factors.removeFirst();
 
@@ -760 +785 @@
 
   success=1;
-  for ( CFFListIterator i=Factors; i.hasItem(); i++ ){
+  for ( CFFListIterator i=Factors; i.hasItem(); i++ )
+  {
     output=newfactoras(i.getItem().factor(),as, success);
     for ( CFFListIterator j=output; j.hasItem(); j++)