Changeset 52d480 in git


Ignore:
Timestamp:
Feb 28, 2012, 6:36:11 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
d8b0f69f9828897dca663d5bb516369b1b0ac64a
Parents:
d901095118d1ee38940016e9b6c108a54485ac2a
Message:
fix: qring for rings with cf=ring
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/ipassign.cc

    rd90109 r52d480  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id$ */
    5 
    64/*
    75* ABSTRACT: interpreter:
     
    189187    WarnS("Set minpoly over non-transcendental ground field to 0?!");
    190188#endif
    191     return FALSE;   
    192   }
    193    
    194    
     189    return FALSE;
     190  }
     191
     192
    195193  if ( !nCoeff_is_transExt(currRing->cf) )
    196194  {
     
    204202  {
    205203//    return TRUE;
    206 #ifndef NDEBUG     
     204#ifndef NDEBUG
    207205    idhdl p = currRing->idroot;
    208206
     
    213211      Print(p->String(TRUE)); PrintLn();
    214212      p = p->next;
    215     }   
     213    }
    216214#endif
    217215  }
    218216
    219217  assume (currRing->idroot==NULL);
    220  
     218
    221219  number p = (number)a->CopyD(NUMBER_CMD);
    222220
     
    225223    n_Delete(&p, currRing);
    226224
    227    
     225
    228226    if( nCoeff_is_transExt(currRing->cf) )
    229227    {
    230 #ifndef NDEBUG     
     228#ifndef NDEBUG
    231229      WarnS("minpoly is already 0...");
    232230#endif
     
    235233
    236234    WarnS("cannot set minpoly to 0 / alg. extension?");
    237    
     235
    238236//    return TRUE;
    239237  }
     
    247245    killhdl2(currRing->idroot,&(currRing->idroot),currRing);
    248246  }
    249  
     247
    250248  n_Normalize(p, currRing->cf);
    251249
    252250  AlgExtInfo A;
    253  
     251
    254252  A.r = currRing->cf->extRing; // Use the same ground field!
    255253  A.i = idInit(1,1);
    256254
    257255  assume( DEN((fractionObject *)(p)) == NULL ); // minpoly must be a poly...!?
    258  
     256
    259257  A.i->m[0] = NUM((fractionObject *)p);
    260258
     
    268266
    269267  NUM((fractionObject *)p) = NULL; n_Delete(&p, currRing->cf);
    270  
     268
    271269  coeffs new_cf = nInitChar(n_algExt, &A);
    272  
     270
    273271  if (new_cf==NULL)
    274272  {
     
    692690  if (rField_is_Ring(currRing))
    693691  {
    694     int constIndex = idPosConstant(id);
    695     if (constIndex != -1)
    696     WerrorS("ideal contains constant; please modify ground field/ring instead");
    697     return TRUE;
     692    if (idPosConstant(id) != -1)
     693    {
     694      WerrorS("constant in q-ideal; please modify ground field/ring instead");
     695      return TRUE;
     696    }
    698697  }
    699698#endif
     
    17481747      {
    17491748        case IDEAL_CMD:
    1750         case MODUL_CMD:
     1749        case MODUL_CMD:
    17511750        {
    17521751          ideal F=idInit(1,1);
Note: See TracChangeset for help on using the changeset viewer.