Changeset 9e9b7c in git for libfac/charset/charset.cc

Timestamp:

May 31, 2008, 7:20:10 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

434e4154dbfea91da1283c2a039af70b75a4e85e

Parents:

2c3cda8da51049289f57702038ff42c44f290497

Message:

hannes: minor irras changes


git-svn-id: file:///usr/local/Singular/svn/trunk@10732 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• libfac/charset/charset.cc (modified) (7 diffs)

libfac/charset/charset.cc

@@ -2 +2 @@
 ////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-/* $Id: charset.cc,v 1.14 2008-04-08 16:19:09 Singular Exp $ */
+/* $Id: charset.cc,v 1.15 2008-05-31 17:20:10 Singular Exp $ */
 /////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -530 +530 @@
 
 static CFList
-irras( CFList & AS, int & ja, CanonicalForm & reducible){
+irras( CFList & AS, int & ja, CanonicalForm & reducible)
+{
   CFFList qs;
   CFList ts,as;
@@ -539 +540 @@
   ja = 0;
   DEBOUTLN(CERR, "irras: called with: AS= ", AS);
-  for ( i=AS; i.hasItem(); i++ ){
+  for ( i=AS; i.hasItem(); i++ )
+  {
     elem = i.getItem();
     nr += 1;
@@ -545 +547 @@
     if ( degree(elem) > 1 ) // linear poly's are irreduzible
     {
+      //qs = Factorize2(elem,CanonicalForm(0));
       qs = Factorize(elem);
-    }
-    else{
+      // remove a constant
+      if (qs.getFirst().factor().degree()==0) qs.removeFirst();
+    }
+    else
+    {
       qs=(CFFactor(elem,1));
-      qs.insert(CFFactor(CanonicalForm(1),1));
     }
     DEBOUTLN(CERR, "  = ", qs);
@@ -555 +560 @@
     if ( interrupt_handle() ) return CFList() ;
     // INTERRUPTHANDLER
-    qs.removeFirst();
-    if ( (qs.length() >= 2 ) || (qs.getFirst().exp() > 1)){
+
+    if ( (qs.length() >= 2 ) || (qs.getFirst().exp() > 1))
+    {
       DEBOUTLN(CERR, "irras: Setting ind=0, ja= ", nr);
       ja=nr; ind=0; reducible= elem;
@@ -564 +570 @@
   }
   //  CERR << "ind= " << ind << "\n";
-  if ( (ind == 1) ){ //&& ( as.length() > 1) ){
-    if ( irreducible(AS) ){ // as quasilinear? => irreducible!
+  if ( (ind == 1) ) //&& ( as.length() > 1) )
+  {
+    if ( irreducible(AS) )
+    { // as quasilinear? => irreducible!
       ja = 0;
       DEBOUTLN(CERR, "as is irreducible. as= ", AS);
     }
-    else {
+    else
+    {
       i=AS;
-      for ( nr=1; nr< AS.length(); nr++){
+      for ( nr=1; nr< AS.length(); nr++)
+      {
         as.append(i.getItem());
         i++;
-        if ( degree(i.getItem()) > 1 ){// search for a non linear elem
+        if ( degree(i.getItem()) > 1 )
+        {  // search for a non linear elem
           elem=i.getItem();
-//          CERR << "f=  " << elem << "\n";
-//        CERR << "as= " << as << "\n";
-          qs= newfactoras(elem,as,success);
-//          CERR << "irras:newfactoras    qs= " << qs << "\n";
-//          qs= factoras(elem,as,success);
-//          CERR << "irras:factoras qs= " << qs << "\n";
-          if ( qs.length() > 1 || qs.getFirst().exp() > 1 ){ //found elem is reducible
+          if (as.length()==1)
+            qs = Factorize2(elem,as.getFirst());
+          else
+            qs= newfactoras(elem,as,success);
+          if ( qs.length() > 1 || qs.getFirst().exp() > 1 )
+          { //found elem is reducible
             reducible=elem;
             ja=nr+1;
@@ -595 +605 @@
   return ts;
 }
+
 ///////////////////////////////////////////////////////////////////////////////
 /*
 $Log: not supported by cvs2svn $
+Revision 1.14  2008/04/08 16:19:09  Singular
+*hannes: removed rcsid
+
 Revision 1.13  2008/03/18 17:46:14  Singular
 *hannes: gcc 4.2