Changeset fc94e12 in git


Ignore:
Timestamp:
Jul 29, 2011, 5:32:50 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
f625fe2dcd54b36842ce99b5160bfe10d0073f83
Parents:
2b85f31ccb9b0e9c18d6a04d1701eecb4d30b074
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-29 17:32:50+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:01:16+01:00
Message:
fix fglmzero.cc
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/fglmzero.cc

    r2b85f31 rfc94e12  
    2020
    2121#include <kernel/mod2.h>
    22 
    2322#ifdef HAVE_FACTORY
     23// assumes, that NOSTREAMIO is set in factoryconf.h, which is included
     24// by templates/list.h.
     25#include <factory/factory.h>
     26#include <factory/templates/ftmpl_list.h>
     27
    2428#include <misc/options.h>
    2529#include <polys/polys.h>
     
    3438#include <kernel/fglmvec.h>
    3539#include <kernel/fglmgauss.h>
    36 // assumes, that NOSTREAMIO is set in factoryconf.h, which is included
    37 // by templates/list.h.
    38 #include <factory/templates/ftmpl_list.h>
    3940#define PROT(msg)
    4041#define STICKYPROT(msg) if (BTEST1(OPT_PROT)) Print(msg)
     
    142143    int * perm = (int *)omAlloc0( (_nfunc+1)*sizeof( int ) );
    143144    maFindPerm( source->names, source->N, NULL, 0, currRing->names,
    144                 currRing->N, NULL, 0, perm, NULL , currRing->ch);
    145     nMapFunc nMap=nSetMap( source);
     145                currRing->N, NULL, 0, perm, NULL , currRing->cf->type);
     146    nMapFunc nMap=n_SetMap( source, currRing);
    146147
    147148    matHeader ** temp = (matHeader **)omAlloc( _nfunc*sizeof( matHeader * ));
     
    152153                  row--, elemp++ )
    153154                {
    154                     newelem= nMap( elemp->elem );
     155                    newelem= nMap( elemp->elem, source->cf, currRing->cf );
    155156                    nDelete( & elemp->elem );
    156157                    elemp->elem= newelem;
     
    11771178fglmzero( ring sourceRing, ideal & sourceIdeal, idhdl destRingHdl, ideal & destIdeal, BOOLEAN switchBack, BOOLEAN deleteIdeal )
    11781179{
    1179     idhdl initialRingHdl = currRingHdl;
     1180    //idhdl initialRingHdl = currRingHdl;
    11801181    BOOLEAN fglmok;
    11811182
     
    11831184    {
    11841185        rChangeCurrRing( sourceRing );
    1185         currRingHdl=NULL;
    1186     }
    1187     idealFunctionals L( 100, (currRing->N) );
     1186        //currRingHdl=NULL;
     1187    }
     1188    idealFunctionals L( 100, rVar(currRing) );
    11881189    fglmok = CalculateFunctionals( sourceIdeal, L );
    11891190    if ( deleteIdeal == TRUE )
    11901191        idDelete( & sourceIdeal );
    1191     rSetHdl( destRingHdl );
     1192    //rSetHdl( destRingHdl );
    11921193    if ( fglmok == TRUE )
    11931194    {
     
    11951196        destIdeal= GroebnerViaFunctionals( L );
    11961197    }
    1197     if ( (switchBack == TRUE) && (currRingHdl != initialRingHdl) )
    1198         rSetHdl( initialRingHdl );
     1198    //if ( (switchBack) && (currRingHdl != initialRingHdl) )
     1199    //    rSetHdl( initialRingHdl );
    11991200    return fglmok;
    12001201}
Note: See TracChangeset for help on using the changeset viewer.