syfi team mailing list archive

[Ola Skavhaug <skavhaug@xxxxxxxxx>]

Kent-Andre Mardal skrev den 11/12-2007 følgende:
> tir, 11.12.2007 kl. 14.31 +0100, skrev Ola Skavhaug:
> > Here are the relevant files:
> > acinclude.m4
> > configure.ac
> 
> I know :) 

:)
 
> > 
> > They will break the old ginac-config installations. I also have modified
> > versions of ex.i and typemaps.i. Tell me if you want them.
> > 
> 
> I need them. I need to prefix ex with GiNaC::ex. 

OK, here they are.

Ola
 
> > Ola
> > 
> > Kent-Andre Mardal skrev den 11/12-2007 følgende:
> > > I'll have a look, but probably not before tonight. 
> > > 
> > > Kent
> > > 
> > > 
> > > tir, 11.12.2007 kl. 08.16 +0100, skrev Ola Skavhaug:
> > > > Hi list,
> > > > 
> > > > I have tried to compile syfi using ginac 1.4.1 and corresponding swiginac. It
> > > > did not work, which autoconf correctly reported. I proceed anyway, using the
> > > > new swiginac interface files for ex.i and typemaps.i.  I also used
> > > > --with-ginac-prefix=/my/ginac/prefix, but since it was not used during
> > > > compilation, I have no way of telling if my fixes are correct.
> > > > 
> > > > I can always roll back to an old ginac version, but I would prefer to have
> > > > syfi running with ginac 1.4. Am I missing something with the
> > > > --with-ginac-prefix, or is that option not used when configure give a
> > > > warning about the ginac version?
> > > > 
> > > > Ola
> > > > 
> > > > _______________________________________________
> > > > SyFi-dev mailing list
> > > > SyFi-dev@xxxxxxxxxx
> > > > http://fenics.org/mailman/listinfo/syfi-dev
> > > 
> > > _______________________________________________
> > > SyFi-dev mailing list
> > > SyFi-dev@xxxxxxxxxx
> > > http://fenics.org/mailman/listinfo/syfi-dev
> > _______________________________________________
> > SyFi-dev mailing list
> > SyFi-dev@xxxxxxxxxx
> > http://fenics.org/mailman/listinfo/syfi-dev
> 
> _______________________________________________
> SyFi-dev mailing list
> SyFi-dev@xxxxxxxxxx
> http://fenics.org/mailman/listinfo/syfi-dev

/*
 (c) Copyright 2003, 2004, 2005
     Author: Ola Skavhaug and Ondrej Certik
     
     This file is part of swiginac.

     swiginac is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.

     swiginac is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.

     You should have received a copy of the GNU General Public License
     along with swiginac; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

%{ 
GiNaC::lst* list2lst(PyObject *input);
PyObject* lst2list(GiNaC::lst *input); 

//GETDESC1 and GETDESC2 are equivalent - GETDESC1 is the official way how to do
//it, but it's slower than the undocumented way GETDESC2.

#define GETDESC1(NAME) \
static swig_type_info *NAME##descr=0;\
if (!NAME##descr){\
    NAME##descr=SWIG_TypeQuery("GiNaC::"#NAME" *");\
    if (!NAME##descr) {\
        PyErr_SetString(PyExc_ValueError,"Cannot get a "#NAME" descriptor. Fix in ex.i");\
        return NULL;\
    }\
}

#define GETDESC2(NAME) \
static swig_type_info *NAME##descr=SWIGTYPE_p_GiNaC__##NAME

#define GETDESC(NAME) GETDESC1(NAME)

//converts any type from python to ex
GiNaC::ex * type2ex(PyObject * input) {
    basic *btmp;
    GETDESC(basic);
    if (not((SWIG_ConvertPtr(input, (void **) &btmp, basicdescr,0)) == -1))
        return new GiNaC::ex((*btmp));
    if (PyInt_Check(input)) 
        return new GiNaC::ex(numeric(PyInt_AsLong(input)));
    if (PyFloat_Check(input)) 
        return new GiNaC::ex(numeric(PyFloat_AsDouble(input)));
    if (PyList_Check(input)) {
        lst *l=list2lst(input);
        if (l==NULL) return NULL;
        return new GiNaC::ex(l->eval());
    }
    return NULL;
} 

GiNaC::numeric * type2numeric(PyObject * input) {
    GiNaC::numeric *btmp;
    GETDESC(numeric);
    if (not((SWIG_ConvertPtr(input, (void **) &btmp, numericdescr,0)) == -1))
        return new numeric((*btmp));
    if (PyInt_Check(input)) 
        return new numeric(PyInt_AsLong(input));
    if (PyFloat_Check(input)) 
        return new numeric(PyFloat_AsDouble(input));
    return NULL;
} 


bool checktype2ex(PyObject * input) {
    //we assume, that everything can be converted to ex. 
    //if you find some counterexample, write test for it first (which fail)
    //and then implement it here.
    return true;
}

#define EX2(NAME) \
if (tinfo_key == &NAME::tinfo_static) {\
    NAME *p = new NAME(GiNaC::ex_to<NAME>(*convert));\
    GETDESC(NAME);\
    return SWIG_NewPointerObj((void *)p, NAME##descr, 1);\
} else

//unwraps ex and return python object
PyObject * ex2type(const GiNaC::ex* input) {

    GiNaC::ex tmp;
    try {
        tmp = input->evalm();
    } catch(std::exception & e)
    {
        tmp = *input;
    }

    const GiNaC::ex* convert = &tmp;

    //switch (GiNaC::ex_to<basic>(*convert).tinfo()) {
    tinfo_t tinfo_key = GiNaC::ex_to<basic>(*convert).tinfo();

        EX2(symbol)
        EX2(constant)
        EX2(numeric)
    if (tinfo_key == &lst::tinfo_static) {
        GiNaC::lst *l = new GiNaC::lst(GiNaC::ex_to<lst>(*convert));
        return lst2list(l);
    } else
        EX2(pseries)
        EX2(su3one)
        EX2(su3t)
        EX2(su3f)
        EX2(su3d)
        EX2(diracone)
        EX2(diracgamma)
        EX2(diracgamma5)
        EX2(diracgammaL)
        EX2(diracgammaR)
        EX2(tensor)
        EX2(tensdelta)
        EX2(tensmetric)
        EX2(minkmetric)
        EX2(spinmetric)
        EX2(tensepsilon)
        EX2(wildcard)
        EX2(indexed)
        EX2(color)
        EX2(clifford)
        EX2(idx)
        EX2(varidx)
        EX2(spinidx)
        EX2(symmetry)
        EX2(integral)
        EX2(cliffordunit)
        EX2(relational)
        EX2(function)
        EX2(add)
        EX2(mul)
        EX2(ncmul)
        EX2(matrix)
        EX2(power)
    {
            throw (std::logic_error("Cannot unwrap ex. Fix in ex.i"));
    }
}

//converts ginac lst to python list (unwrapping all exs)
PyObject *lst2list(GiNaC::lst *input) {
    lst::const_iterator i = input->begin();
    lst::const_iterator i_end = input->end();
    PyObject *pylist = PyList_New(0);
    while (i!=i_end) {
        PyObject *item = ex2type(&(*i));
        PyList_Append(pylist, item);
        //is this necessary?
        Py_INCREF(item);
        i++;
    }
    return (pylist);
}

/*
PyObject *lst2list(GiNaC::lst *input) {
    GiNaC::lst *l = input;
    int n = l->nops(); 
    PyObject *pylist = PyList_New(n);
    PyObject *item;
    for (int i=0;i<n;i++) {
        item = ex2type(&(l->let_op(i)));
        PyList_SetItem(pylist, i, item);
        Py_INCREF(item);
    }
    return (pylist);
}*/

//convert any python list to ginac lst
GiNaC::lst* list2lst(PyObject * input)
{
    GiNaC::lst *out=new lst();
    if PyList_Check(input) {
        int n = PyList_Size(input);
        PyObject *item;
        GiNaC::ex *tmp;
        for (int i = 0; i<n;i++) {
            item = PyList_GetItem(input, i);
            tmp = type2ex(item);
            if (tmp) {
                out->append(*tmp);
            } else {
                PyErr_SetString(PyExc_ValueError,"Cannot convert type to ex.");
                return NULL;
            }
        }
        return out;
    }
    else {
        PyErr_SetString(PyExc_ValueError,"List expected.");
        delete out;
        return NULL;
    }
}

//converts ginac exvector to python list (unwrapping all exs)
PyObject *exvector2list(GiNaC::exvector *input) {
    exvector::const_iterator i = input->begin();
    exvector::const_iterator i_end = input->end();
    PyObject *pylist = PyList_New(0);
    while (i!=i_end) {
        PyObject *item = ex2type(&(*i));
        PyList_Append(pylist, item);
        //is this necessary?
        Py_INCREF(item);
        i++;
    }
    return (pylist);
}

%}

// vim:ft=cpp:

/*
 (c) Copyright 2003, 2004, 2005
     Author: Ola Skavhaug and Ondrej Certik
     
     This file is part of swiginac.

     swiginac is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.

     swiginac is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.

     You should have received a copy of the GNU General Public License
     along with swiginac; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

%typemap(in) (int idx0, int idx1) {
    if(PyTuple_Check($input))
    {
        $1 = PyInt_AsLong(PyTuple_GetItem($input,0));
        if(PyTuple_Size($input) > 1)
            $2 = PyInt_AsLong(PyTuple_GetItem($input,1));
        else
            $2 = 0;
    }
    else
    {
        $1 = PyInt_AsLong($input);
        $2 = 0;
    }
}

%typemap(in) GiNaC::lst & {
    $1=list2lst($input);
    if (!$1) return NULL;
}

%typemap(typecheck, precedence=1200) GiNaC::lst & {
    $1 = (PyList_Check($input)) ? 1 : 0;
}

%{
// class to handle deleting a temporary resource in an input typemap
template<class T>
class TDeleter
{
public:

  T * obj;
  
  TDeleter():
    obj(0)
  {
    //std::cout << "TDeleter constructor." << std::endl;
  }
  
  ~TDeleter()
  {
    //std::cout << "TDeleter destructor, obj = " << obj << std::endl;
    if(obj)
    {
      //std::cout << "TDeleter deleting obj:" << std::endl;
      delete obj;
      //std::cout << "TDeleter done deleting obj." << std::endl;
    }
    //std::cout << "TDeleter is now destroyed." << std::endl;
  }

};

typedef TDeleter<GiNaC::ex> ex_deleter;
typedef TDeleter<const GiNaC::ex> const_ex_deleter;
%}

%typemap(in) GiNaC::ex & (ex_deleter deleter) {
  $1 = type2ex($input);
  if ($1 == NULL ) {
      return NULL;
  }
  deleter.obj = $1;
}

%typemap(in) const GiNaC::ex & (const_ex_deleter deleter) {
  $1 = type2ex($input);
  if ($1 == NULL ) {
      return NULL;
  }
  deleter.obj = $1;
}

//%typemap(in) const ex & = ex &;

%typemap(in) GiNaC::ex  {
  ex *tmp = type2ex($input);
  if (tmp == NULL ) {
      return NULL;
  }
  $1 = *(tmp); 
  delete tmp; 
}

%typemap(in) const GiNaC::ex = GiNaC::ex;

%typemap(in) numeric & {
    $1 = type2numeric($input);
    if (!$1) return NULL;
}

%typemap(typecheck, precedence=1210) GiNaC::ex & {
    $1 = (checktype2ex($input)) ? 1 : 0;
}

%typemap(typecheck, precedence=1209) GiNaC::ex {
    $1 = (checktype2ex($input)) ? 1 : 0; // TODO: This could be wrong, while ex& is treated as a pointer by swig, ex is not, at least in the typemap(in) above.
}

%typemap(out) GiNaC::ex {
    $result = ex2type(&($1));
}

//%typemap(out) GiNaC::ex *{
//    $result = ex2type($1);
//    delete $1;
//}


%typemap(out) GiNaC::exvector {
    $result = exvector2list(&($1));
}

%typemap(out) GiNaC::lst & {
    $result = lst2list($1);
}

//it seems we don't need these
/*
%typemap(out) ex &{
    $result = ex2type($1);
}*/

// vim:ft=cpp: