Changeset 7a2741 in git

Timestamp:

Aug 24, 2005, 12:06:46 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

67f14ad6b5d0aa2edbdc38a0c96bcedc91df7ad8

Parents:

c300ecadf7d5fa33f3ab124f335b6cd1b59424b0

Message:

*bricken: faster compilation for vector


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

Location:

modules/python

Files:

• Makefile (modified) (1 diff)
• vector_wrap.cc (added)
• vector_wrap.h (added)
• wrapper.h (modified) (4 diffs)

modules/python/Makefile

@@ -21 +21 @@
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA    = ${INSTALL} -m 644
-SRCS    = python.cc poly_wrap.cc
-OBJS    = python.o poly_wrap.o
-DOBJS   = python.og poly_wrap.og
+SRCS    = python.cc poly_wrap.cc vector_wrap.cc
+OBJS    = python.o poly_wrap.o vector_wrap.o
+DOBJS   = python.og poly_wrap.og vector_wrap.og
 
 all:    python_module.so python_module_g.so 
 
-%.o: %.cc Makefile wrapper.h
+%.o: %.cc Makefile 
         ${CXX} ${CFLAGS} -c -fPIC -DPIC $< -o $*.o
 
-%.og: %.cc Makefile wrapper.h
+%.og: %.cc Makefile
         ${CXX} ${DCFLAGS} -c -fPIC -DPIC $< -o $*.og
 

modules/python/wrapper.h

@@ -1 @@
-//$Id: wrapper.h,v 1.17 2005-08-24 09:27:07 bricken Exp $
+//$Id: wrapper.h,v 1.18 2005-08-24 10:06:46 bricken Exp $
 #ifndef PYTHON_SINGULAR_WRAPPER_HEADER
 #define PYTHON_SINGULAR_WRAPPER_HEADER
@@ -20 +20 @@
 #include <factory.h>
 #include "poly_wrap.h"
+#include "vector_wrap.h"
 extern BOOLEAN errorreported;
 extern int inerror;
@@ -44 +45 @@
 }
 
-static boost::python::object Vector_as_str(Vector& p)
-{
-  using boost::python::str;
-  //ring r=p.getRing();
- 
-  char* out=p.c_string();
-  return boost::python::str(out,strlen(out));
-}
+
 
 
@@ -232 +226 @@
     .def(self/=int());
 
-  boost::python::class_<Vector>("vector")
-    .def(boost::python::init <>())
-    .def("__str__", Vector_as_str)
-    
-    //    .def("__str__", Poly_as_str)
-    .def("__iter__", boost::python::iterator<Vector>())
-    .def(-self)
-    .def(self+=self)
-   
-    .def(self+self)
-    .def(self*=Number())
-    .def(Poly() * self)
-    .def(Number() * self);
+  export_vector();
   boost::python::class_<PowerSeries>("power_series")       
     .def(boost::python::init <const PowerSeries::numerator_type &,const PowerSeries::denominator_type&>())