Changeset 6d6383b in git


Ignore:
Timestamp:
Jan 30, 2008, 9:14:45 AM (15 years ago)
Author:
Oliver Wienand <wienand@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')
Children:
d772c3a7fde8da702386b51d66296d48b7be5edf
Parents:
fbf2b132fe6bf311c4db292ac1f0a14cb16b2728
Message:
misc.cc:
aenderungen in einem ifdef 0 block

ipshell.cc:
ringflaga ist exponent in Z/2^k und Z/p^k
müll entfernt


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

Legend:

Unmodified
Added
Removed
  • Singular/ipshell.cc

    rfbf2b1 r6d6383b  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipshell.cc,v 1.172 2008-01-11 10:56:45 Singular Exp $ */
     4/* $Id: ipshell.cc,v 1.173 2008-01-30 08:14:45 wienand Exp $ */
    55/*
    66* ABSTRACT:
     
    554554}
    555555
    556 #ifdef HAVE_RING2TOM_OLD
    557 // avoid to test the "special" char: -1, 0, 1, 2
    558 int Is2toM(int p)  /* brute force !!!! */
    559 {
    560   if (p <= 2) return 0;
    561   int test = p;
    562   int i = 0;
    563   while (p%2 == 0) {
    564     p = p / 2;
    565     i++;
    566   }
    567   if (p == 1) {
    568     return i;
    569   }
    570   return 0;
    571 }
    572 #endif
    573 
    574556int IsPrime(int p)  /* brute force !!!! */
    575557{
     
    44854467    {
    44864468      ringtype = 1; // Use Z/2^ch
    4487       ringflaga = exp;
     4469      ringflaga = 2;
     4470      ringflagb = exp;
    44884471      WarnS("Z/2^n not yet fully tested");
    44894472    }
  • Singular/misc.cc

    rfbf2b1 r6d6383b  
    296296        if (TEST_OPT_INTSTRATEGY && (currRing!=NULL)
    297297        && rField_has_simple_inverse()
    298 #ifdef HAVE_RING2TOM
    299         && !rField_is_Ring_2toM(currRing)
    300 #endif
    301 #ifdef HAVE_RINGMODN
    302         && !rField_is_Ring_ModN(currRing)
     298#ifdef HAVE_RINGS
     299        && !rField_is_Ring(currRing)
    303300#endif
    304301        ) {
     
    331328        if (TEST_OPT_INTSTRATEGY && (currRing!=NULL)
    332329        && rField_has_simple_inverse()
    333 #ifdef HAVE_RING2TOM
    334         && !rField_is_Ring_2toM(currRing)
    335 #endif
    336 #ifdef HAVE_RINGMODN
    337         && !rField_is_Ring_ModN(currRing)
     330#ifdef HAVE_RINGS
     331        && !rField_is_Ring(currRing)
    338332#endif
    339333        ) {
Note: See TracChangeset for help on using the changeset viewer.