summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Glover <glover.john@gmail.com>2011-08-20 18:13:40 +0100
committerJohn Glover <glover.john@gmail.com>2011-08-20 18:13:40 +0100
commit88531b9853b261aa85c97d8e297802df0962c03c (patch)
tree3bac5f319264ca6a96c2c5bb5eaeb5f4ed5f61a9
parentd224347b1b7a059ab14d4f170a70e735f84fc1e6 (diff)
downloadsimpl-88531b9853b261aa85c97d8e297802df0962c03c.tar.gz
simpl-88531b9853b261aa85c97d8e297802df0962c03c.tar.bz2
simpl-88531b9853b261aa85c97d8e297802df0962c03c.zip
Add std vector wrapper
-rw-r--r--simpl/common.i4
-rw-r--r--simpl/simplloris.i9
2 files changed, 4 insertions, 9 deletions
diff --git a/simpl/common.i b/simpl/common.i
index c45bab8..12781a4 100644
--- a/simpl/common.i
+++ b/simpl/common.i
@@ -1,7 +1,11 @@
%include exception.i
%include std_string.i
+%include std_vector.i
+%include std_list.i
%include "numpy.i"
+%template(DoubleVector) std::vector<Simpl::number>;
+
%exception
{
try
diff --git a/simpl/simplloris.i b/simpl/simplloris.i
index d142bc3..e1f11d7 100644
--- a/simpl/simplloris.i
+++ b/simpl/simplloris.i
@@ -15,15 +15,6 @@
import_array();
%}
-/* %apply(double* IN_ARRAY1, int DIM1) {(double* in_vector, int size)}; */
-/* %apply(double* INPLACE_ARRAY1, int DIM1) {(double* out_vector, int size)}; */
-
-/* %apply (int DIM1, double* IN_ARRAY1) */
-/* { */
-/* (int numamps, double* amps), */
-/* (int numfreqs, double* freqs), */
-/* (int numphases, double* phases) */
-/* } */
%include "../src/simpl/base.h"
%include "../src/simpl/exceptions.h"
%include "../src/simpl/simplloris.h"