Changeset 39457c in git


Ignore:
Timestamp:
Sep 15, 2011, 6:30:41 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
e8521255a86e408ae951c170cf03b353c321be74
Parents:
35e86e4b8846ae589996e378f75e28b2aa48605e
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-09-15 18:30:41+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:50+01:00
Message:
fix: Module2Matrix/Matrix2Module: less dep. on currRing
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    r35e86e r39457c  
    27472747        rChangeCurrRing(r);
    27482748        matrix  m = (matrix)IDDATA(w);
    2749         ideal   Q = idMatrix2Module(mp_Copy(m, currRing));
     2749        ideal   Q = id_Matrix2Module(mp_Copy(m, currRing),currRing);
    27502750        rChangeCurrRing(save);
    27512751        ideal   S = idOppose(r,Q,currRing);
    27522752        id_Delete(&Q, r);
    2753         res->data = idModule2Matrix(S);
     2753        res->data = id_Module2Matrix(S,currRing);
    27542754        res->rtyp = argtype;
    27552755        break;
     
    36693669  if (sm_CheckDet((ideal)m,m->cols(),TRUE, currRing))
    36703670  {
    3671     ideal I=idMatrix2Module(mp_Copy(m, currRing));
     3671    ideal I=id_Matrix2Module(mp_Copy(m, currRing),currRing);
    36723672    p=sm_CallDet(I, currRing);
    36733673    idDelete(&I);
     
    36993699  if (sm_CheckDet(I,IDELEMS(I),FALSE, currRing))
    37003700  {
    3701     matrix m=idModule2Matrix(idCopy(I));
     3701    matrix m=id_Module2Matrix(id_Copy(I,currRing),currRing);
    37023702    p=singclap_det(m,currRing);
    37033703    idDelete((ideal *)&m);
     
    64076407  }
    64086408  else if(v1->Typ()==IDEAL_CMD||v1->Typ()==MATRIX_CMD)
    6409     L->m[1].data=(void *)idModule2Matrix(R);
     6409    L->m[1].data=(void *)id_Module2Matrix(R,currRing);
    64106410  else
    64116411  {
  • Singular/ipconv.cc

    r35e86e r39457c  
    131131static void * iiMo2Ma(void *data)
    132132{
    133   void *res=idModule2Matrix((ideal)data);
     133  void *res=id_Module2Matrix((ideal)data,currRing);
    134134  return res;
    135135}
     
    137137static void * iiMa2Mo(void *data)
    138138{
    139   void *res=idMatrix2Module((matrix)data);
     139  void *res=id_Matrix2Module((matrix)data,currRing);
    140140  return res;
    141141}
  • Singular/ipprint.cc

    r35e86e r39457c  
    244244      case MODUL_CMD:
    245245      {
    246         matrix m = idModule2Matrix(idCopy((ideal) u->Data()));
     246        matrix m = id_Module2Matrix(id_Copy((ideal) u->Data(),currRing),currRing);
    247247        ipPrint_MA0(m, u->Name());
    248         idDelete((ideal *) &m);
     248        id_Delete((ideal *) &m,currRing);
    249249        break;
    250250      }
  • kernel/ideals.cc

    r35e86e r39457c  
    19051905    return NULL;
    19061906  }
    1907   h = idMatrix2Module(mp_Copy(a,currRing));
     1907  h = id_Matrix2Module(mp_Copy(a,currRing),currRing);
    19081908  bound = sm_ExpBound(h,c,r,ar,currRing);
    19091909  idDelete(&h);
  • kernel/ideals.h

    r35e86e r39457c  
    176176}
    177177
    178 inline ideal   idMatrix2Module(matrix mat, const ring R = currRing)
    179 {
    180   return idMatrix2Module(mat, R);
    181 }
    182 
    183 inline matrix  idModule2Matrix(ideal mod, const ring R = currRing)
    184 {
    185   return id_Module2Matrix(mod, R);
    186 }
    187178inline matrix  idModule2formatedMatrix(ideal mod, int rows, int cols, const ring R = currRing)
    188179{
  • numeric/mpr_base.cc

    r35e86e r39457c  
    25152515
    25162516  // obachman: idMatrix2Module frees resmat !!
    2517   ideal resmod= idMatrix2Module(resmat);
     2517  ideal resmod= id_Matrix2Module(resmat,currRing);
    25182518  return resmod;
    25192519}
     
    25462546
    25472547  // obachman: idMatrix2Module frees resmat !!
    2548   ideal resmod= idMatrix2Module(resmat);
     2548  ideal resmod= id_Matrix2Module(resmat,currRing);
    25492549  return resmod;
    25502550}
Note: See TracChangeset for help on using the changeset viewer.