Changeset 9e131d in git


Ignore:
Timestamp:
Jun 14, 2006, 5:35:08 PM (18 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
Children:
4a38bd8f88228c80374066df9e2be718cca09a25
Parents:
b61808b19dacd9344b29984c4d625e2ba8f85e8e
Message:
*hannes: CS renamed


git-svn-id: file:///usr/local/Singular/svn/trunk@9220 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
libfac/charset
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libfac/charset/charset.cc

    rb61808 r9e131d  
    22////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 static char * rcsid = "$Id: charset.cc,v 1.11 2006-05-16 14:46:49 Singular Exp $";
     4static char * rcsid = "$Id: charset.cc,v 1.12 2006-06-14 15:35:08 Singular Exp $";
    55/////////////////////////////////////////////////////////////
    66// FACTORY - Includes
     
    112112CFList
    113113MCharSetN( const CFList &PS, PremForm & Remembern ){
    114   CFList QS = PS, RS = PS, CS, OLDCS;
     114  CFList QS = PS, RS = PS, CSet, OLDCS;
    115115
    116116  DEBOUTLN(CERR, "MCharSetN: called with ps= ", PS);
    117117  while ( ! RS.isEmpty() ) {
    118     CS = BasicSet( QS );
    119     OLDCS=CS;
    120     DEBOUTLN(CERR, "MCharSetN: CS= ", CS);
    121 //     if ( getNumVars(CS.getFirst()) > 1 ){
    122 //       //CS = removecontent(CS, Remembern);
     118    CSet = BasicSet( QS );
     119    OLDCS=CSet;
     120    DEBOUTLN(CERR, "MCharSetN: CS= ", CSet);
     121//     if ( getNumVars(CSet.getFirst()) > 1 ){
     122//       //CSet = removecontent(CSet, Remembern);
    123123// #ifdef MCHARSETNDEBUG
    124 //       CERR << "MCharSetN: CS= " << CS << "\n";
     124//       CERR << "MCharSetN: CSet= " << CSet << "\n";
    125125// #endif
    126126//     }
    127     Remembern.FS1 = Union(Remembern.FS1, initalset1(CS));
     127    Remembern.FS1 = Union(Remembern.FS1, initalset1(CSet));
    128128    DEBOUTLN(CERR, "MCharSetN: Remembern.FS1= ", Remembern.FS1);
    129129    DEBOUTLN(CERR, "MCharSetN: Remembern.FS2= ", Remembern.FS2);
    130130    RS = CFList();
    131     if ( rank( CS.getFirst() ) != 0 ) {
    132       CFList D = Difference( QS, CS );
     131    if ( rank( CSet.getFirst() ) != 0 ) {
     132      CFList D = Difference( QS, CSet );
    133133      DEBOUT(CERR, "MCharSetN: Difference( ", QS);
    134       DEBOUT(CERR, " , ", CS);
     134      DEBOUT(CERR, " , ", CSet);
    135135      DEBOUTLN(CERR, " ) = ", D);
    136 //CERR << "MCharSetN: Difference( " << QS << " , " << CS << " ) = " << D << "\n";
     136//CERR << "MCharSetN: Difference( " << QS << " , " << CSet << " ) = " << D << "\n";
    137137      //PremForm Oldremember=Remembern;
    138138      //PremForm Newremember=Remembern;
    139139      for ( CFListIterator i = D; i.hasItem(); ++i ) {
    140         CanonicalForm r = Prem( i.getItem(), CS );
     140        CanonicalForm r = Prem( i.getItem(), CSet );
    141141        DEBOUT(CERR,"MCharSetN: Prem(", i.getItem()  );
    142         DEBOUT(CERR, ",", CS);
     142        DEBOUT(CERR, ",", CSet);
    143143        DEBOUTLN(CERR,") = ", r);
    144 //CERR << "MCharSetN: Prem("<< i.getItem() << "," << CS << ") = " << r << "\n";
     144//CERR << "MCharSetN: Prem("<< i.getItem() << "," << CSet << ") = " << r << "\n";
    145145        if ( r != 0 ){
    146146          //removefactor( r, Newremember );
     
    164164  DEBOUTLN(CERR, "MCharSetN: Remembern.FS1: ", Remembern.FS1);
    165165
    166   return CS;
     166  return CSet;
    167167}
    168168
     
    183183CFList
    184184CharSet( const CFList &PS ){
    185   CFList QS = PS, RS = PS, CS;
     185  CFList QS = PS, RS = PS, CSet;
    186186
    187187  while ( ! RS.isEmpty() ) {
    188     CS = BasicSet( QS );
    189     DEBOUTLN(CERR, "CharSet: CS= ", CS);
     188    CSet = BasicSet( QS );
     189    DEBOUTLN(CERR, "CharSet: CSet= ", CSet);
    190190    RS = CFList();
    191     if ( rank( CS.getFirst() ) != 0 ) {
    192       CFList D = Difference( QS, CS );
     191    if ( rank( CSet.getFirst() ) != 0 ) {
     192      CFList D = Difference( QS, CSet );
    193193      for ( CFListIterator i = D; i.hasItem(); ++i ) {
    194         CanonicalForm r = Prem( i.getItem(), CS );
     194        CanonicalForm r = Prem( i.getItem(), CSet );
    195195        if ( r != 0 )  RS=Union(CFList(r),RS);//RS.append( r );
    196196      }
     
    198198    }
    199199  }
    200   return CS;
     200  return CSet;
    201201}
    202202
    203203static CFList
    204204charseta( const CFList & PS ){
    205   CFList QS = PS, RS = PS, CS;
     205  CFList QS = PS, RS = PS, CSet;
    206206
    207207  while ( ! RS.isEmpty() ) {
    208     CS = CharSet( QS );
     208    CSet = CharSet( QS );
    209209    RS = CFList();
    210     if ( rank( CS.getFirst() ) != 0 ) {
    211       CFList D = Difference( QS, CS );
     210    if ( rank( CSet.getFirst() ) != 0 ) {
     211      CFList D = Difference( QS, CSet );
    212212      for ( CFListIterator i = D; i.hasItem(); ++i ) {
    213         CanonicalForm r = Prem( i.getItem(), CS );
     213        CanonicalForm r = Prem( i.getItem(), CSet );
    214214        if ( r != 0 )  RS=Union(CFList(r),RS);//RS.append( r );
    215215      }
    216       QS = Union(CS,Union( QS, RS ));
     216      QS = Union(CSet,Union( QS, RS ));
    217217    }
    218218    else return CFList(CanonicalForm(1));
    219219  }
    220   return CS;
     220  return CSet;
    221221}
    222222
     
    599599/*
    600600$Log: not supported by cvs2svn $
     601Revision 1.11  2006/05/16 14:46:49  Singular
     602*hannes: gcc 4.1 fixes
     603
    601604Revision 1.10  2002/08/19 11:11:31  Singular
    602605* hannes/pfister: alg_gcd etc.
  • libfac/charset/csutil.h

    rb61808 r9e131d  
    22////////////////////////////////////////////////////////////
    33// emacs edit mode for this file is -*- C++ -*-
    4 // $Id: csutil.h,v 1.4 2002-08-19 11:11:32 Singular Exp $
     4// $Id: csutil.h,v 1.5 2006-06-14 15:35:08 Singular Exp $
    55////////////////////////////////////////////////////////////
    66
     
    6363void           removefactor( CanonicalForm & r , PremForm & Remembern);
    6464CFList         factorps( const CFList &ps );
    65 //CFList         initalset(const CFList & CS);
    66 CFList         initalset1(const CFList & CS);
    67 CFList         initalset2(const CFList & CS, const CanonicalForm & reducible);
    68 int            irreducible( const CFList & AS);
    69 CFList         select( const ListCFList & PS);
     65//CFList         initalset(const CFList & CSet);
     66CFList         initalset1(const CFList & CSet);
     67CFList         initalset2(const CFList & CSet, const CanonicalForm & reducible);
     68int            irreducible( const CFList & ASet);
     69CFList         select( const ListCFList & PSet);
    7070void           select( const ListCFList & ppi, int length, ListCFList & ppi1,
    7171                       ListCFList & ppi2);
    7272bool           same( const CFList &A, const CFList &B );
    7373bool           member( const CFList & cs, const ListCFList & pi );
    74 bool           subset( const CFList &PS, const CFList &CS );
     74bool           subset( const CFList &PSet, const CFList &CSet );
    7575ListCFList     MyUnion( const ListCFList & a, const ListCFList &b );
    7676ListCFList     MyDifference( const ListCFList & a, const CFList &b);
     
    8181/*
    8282$Log: not supported by cvs2svn $
     83Revision 1.4  2002/08/19 11:11:32  Singular
     84* hannes/pfister: alg_gcd etc.
     85
    8386Revision 1.3  1997/09/12 07:19:42  Singular
    8487* hannes/michael: libfac-0.3.0
Note: See TracChangeset for help on using the changeset viewer.