Changeset c462b55 in git


Ignore:
Timestamp:
Mar 22, 2011, 11:04:13 AM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
494884581702ad06eefdf632a5e1abb42bd90f4d
Parents:
ba0fc3d4dcb089fc5523e7af222a8f52d7cb44b8
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-03-22 11:04:13+01:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:09+01:00
Message:
 p_MinComp, p_MaxComp
Location:
libpolys/polys
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • libpolys/polys/Makefile.am

    rba0fc3 rc462b55  
    1515        templates/p_Procs_Lib.cc \
    1616        polys0.cc polys1.cc prCopy.cc prCopyTemplate.cc \
    17         kbuckets.cc sbuckets.cc templates/p_Procs.cc weights.cc
     17        kbuckets.cc sbuckets.cc templates/p_Procs.cc weight.cc
    1818
    1919BUILT_SOURCES = templates/p_Procs.inc
     
    2828        templates/p_Procs_Dynamic.h templates/p_Procs_Impl.h templates/p_Procs_Set.h templates/p_Procs_Static.h \
    2929        monomials/p_polys.h monomials/polys-impl.h monomials/maps.h polys.h prCopy.h prCopyMacros.h \
    30         kbuckets.h sbuckets.h simpleideals.h weights.h
     30        kbuckets.h sbuckets.h simpleideals.h weight.h
    3131
    3232P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION
  • libpolys/polys/monomials/p_polys.h

    rba0fc3 rc462b55  
    332332static inline   void p_SetCompP(poly a, int i, ring r);
    333333static inline   void p_SetCompP(poly a, int i, ring lmRing, ring tailRing);
    334 static inline   long p_MaxComp(poly p, ring lmRing, ring tailRing);
    335 inline long p_MaxComp(poly p,ring lmRing) {return p_MaxComp(p,lmRing,lmRing);}
    336 static inline   long p_MinComp(poly p, ring lmRing, ring tailRing);
    337 inline long p_MinComp(poly p,ring lmRing) {return p_MinComp(p,lmRing,lmRing);}
     334
     335// returns maximal column number in the modul element a (or 0)
     336static inline long p_MaxComp(poly p, ring lmRing, ring tailRing)
     337{
     338  long result,i;
     339
     340  if(p==NULL) return 0;
     341  result = p_GetComp(p, lmRing);
     342  if (result != 0)
     343  {
     344    loop
     345    {
     346      pIter(p);
     347      if(p==NULL) break;
     348      i = p_GetComp(p, tailRing);
     349      if (i>result) result = i;
     350    }
     351  }
     352  return result;
     353}
     354
     355static inline long p_MaxComp(poly p,ring lmRing) {return p_MaxComp(p,lmRing,lmRing);}
     356
     357static inline   long p_MinComp(poly p, ring lmRing, ring tailRing)
     358{
     359  long result,i;
     360
     361  if(p==NULL) return 0;
     362  result = p_GetComp(p,lmRing);
     363  if (result != 0)
     364  {
     365    loop
     366    {
     367      pIter(p);
     368      if(p==NULL) break;
     369      i = p_GetComp(p,tailRing);
     370      if (i<result) result = i;
     371    }
     372  }
     373  return result;
     374}
     375
     376static inline long p_MinComp(poly p,ring lmRing) {return p_MinComp(p,lmRing,lmRing);}
    338377
    339378/***************************************************************
  • libpolys/polys/pInline0.h

    rba0fc3 rc462b55  
    7373
    7474// returns minimal column number in the modul element a (or 0)
    75 PINLINE0 long p_MinComp(poly p, ring lmRing, ring tailRing)
    76 {
    77   long result,i;
    78 
    79   if(p==NULL) return 0;
    80   result = p_GetComp(p,lmRing);
    81   if (result != 0)
    82   {
    83     loop
    84     {
    85       pIter(p);
    86       if(p==NULL) break;
    87       i = p_GetComp(p,tailRing);
    88       if (i<result) result = i;
    89     }
    90   }
    91   return result;
    92 }
    93 
    94 // returns maximal column number in the modul element a (or 0)
    95 PINLINE0 long p_MaxComp(poly p, ring lmRing, ring tailRing)
    96 {
    97   long result,i;
    98 
    99   if(p==NULL) return 0;
    100   result = p_GetComp(p, lmRing);
    101   if (result != 0)
    102   {
    103     loop
    104     {
    105       pIter(p);
    106       if(p==NULL) break;
    107       i = p_GetComp(p, tailRing);
    108       if (i>result) result = i;
    109     }
    110   }
    111   return result;
    112 }
    113 
    11475BOOLEAN   p_IsConstantPoly(const poly p, const ring r)
    11576{
  • libpolys/polys/sbuckets.cc

    rba0fc3 rc462b55  
    1010 *  Version: $Id$
    1111 *******************************************************************/
    12 #include <kernel/mod2.h>
    13 
    14 #include <kernel/sbuckets.h>
     12//#include <kernel/mod2.h>
     13
     14#include <polys/sbuckets.h>
    1515#include <omalloc/omalloc.h>
    16 #include <kernel/ring.h>
    17 #include <kernel/p_Procs.h>
    18 #include <kernel/p_polys.h>
     16#include <polys/monomials/ring.h>
     17//#include <kernel/p_Procs.h>
     18#include <polys/monomials//p_polys.h>
    1919
    2020
Note: See TracChangeset for help on using the changeset viewer.