Changeset 90adb6a in git


Ignore:
Timestamp:
Feb 2, 2007, 4:19:46 PM (17 years ago)
Author:
Motsak Oleksandr <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '3720ae8bfcff4a4649ee98a15552089151d2d59b')
Children:
80a5be143bbd0daeb5d5d2adf0825aa060b9c8d2
Parents:
846b09257601435fb0a4c993e3bd6233de390298
Message:
*motsak: different sca factor ideal for resolution


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

Legend:

Unmodified
Added
Removed
  • kernel/syz.cc

    r846b09 r90adb6a  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: syz.cc,v 1.11 2006-11-24 10:29:08 Singular Exp $ */
     4/* $Id: syz.cc,v 1.12 2007-02-02 15:19:46 motsak Exp $ */
    55
    66/*
     
    2525#include "prCopy.h"
    2626
     27#ifdef HAVE_PLURAL
     28#include "sca.h"
     29#endif // HAVE_PLURAL
    2730
    2831void syDeleteRes(resolvente * res,int length)
     
    613616syStrategy syResolution(ideal arg, int maxlength,intvec * w, BOOLEAN minim)
    614617{
     618#ifdef HAVE_PLURAL
     619  ideal idSaveCurrQuotient = currQuotient;
     620  ideal idSaveCurrRingQuotient = currRing->qideal;
     621  if( rIsSCA(currRing) )
     622  {
     623    currQuotient = currRing->nc->SCAQuotient();
     624    currRing->qideal = currQuotient;
     625
     626    const unsigned int m_iFirstAltVar = scaFirstAltVar(currRing);
     627    const unsigned int m_iLastAltVar  = scaLastAltVar(currRing);
     628   
     629    arg = id_KillSquares(arg, m_iFirstAltVar, m_iLastAltVar, currRing); // kill suares in input!
     630  }
     631#endif
     632 
    615633  int typ0;
    616634  syStrategy result=(syStrategy)omAlloc0(sizeof(ssyStrategy));
    617635
    618   if ((w!=NULL) && (!idTestHomModule(arg,currQuotient,w)))
     636  if ((w!=NULL) && (!idTestHomModule(arg,currQuotient,w))) // is this right in SCA case???
    619637  {
    620638    WarnS("wrong weights given(2):");w->show();PrintLn();
     
    647665  }
    648666  omFreeSize((ADDRESS)fr,(result->length)*sizeof(ideal));
     667
     668
     669#ifdef HAVE_PLURAL
     670  if( rIsSCA(currRing) )
     671  {
     672    currQuotient     = idSaveCurrQuotient;
     673    currRing->qideal = idSaveCurrRingQuotient;
     674
     675    id_Delete(&arg, currRing);
     676  }
     677#endif
     678
     679
    649680  return result;
    650681}
Note: See TracChangeset for help on using the changeset viewer.