#1360 Return-by-value in SWIG for all Matrix::get* overloads

casadi · Mar 20, 2015 · 7347188 · 7347188 · casadibot · Mar 21, 2015
1 parent 972df10
commit 7347188
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/casadi/core/matrix/matrix.hpp b/casadi/core/matrix/matrix.hpp
@@ -240,8 +240,10 @@ namespace casadi {
     /** \brief Set all the entries without changing sparsity pattern */
     void set(const Matrix<DataType>& val);
 
+#ifndef SWIG
     /** \brief Get all the entries without changing sparsity pattern */
     void get(Matrix<DataType>& val) const;
+#endif // SWIG
 
     ///@{
     /** \brief Get the elements numerically */
@@ -252,9 +254,11 @@ namespace casadi {
 
     ///@{
     /** \brief Get the elements numerically */
+#ifndef SWIG
     void get(double& val) const;
     void get(double* val, bool tr=false) const;
-    void get(std::vector<double>& val, bool tr=false) const;
+#endif // SWIG
+    void get(std::vector<double>& SWIG_OUTPUT(m), bool tr=false) const;
     ///@}
 
     ///@{
@@ -308,9 +312,11 @@ namespace casadi {
 
     ///@{
     /** \brief Get the elements numerically */
+#ifndef SWIG
     void getNZ(double& val) const;
     void getNZ(double* val) const;
-    void getNZ(std::vector<double>& val) const;
+#endif // SWIG
+    void getNZ(std::vector<double>& SWIG_OUTPUT(m)) const;
     ///@}
 
     ///@{
@@ -321,8 +327,10 @@ namespace casadi {
 
     ///@{
     /** \brief Get upper triangular elements */
+#ifndef SWIG
     void getSym(double* val) const;
-    void getSym(std::vector<double>& val) const;
+#endif // SWIG
+    void getSym(std::vector<double>& SWIG_OUTPUT(m)) const;
     ///@}
 
     ///@{

diff --git a/casadi/core/matrix/matrix_impl.hpp b/casadi/core/matrix/matrix_impl.hpp
@@ -2914,7 +2914,7 @@ namespace casadi {
 
   template<typename DataType>
   void Matrix<DataType>::get(std::vector<double>& val, bool tr) const {
-    casadi_assert(val.size()==this->numel());
+    val.resize(this->numel());
     get(getPtr(val), tr);
   }
 
@@ -2959,13 +2959,13 @@ namespace casadi {
 
   template<typename DataType>
   void Matrix<DataType>::getNZ(std::vector<double>& val) const {
-    casadi_assert(val.size()==this->nnz());
+    val.resize(this->nnz());
     getNZ(getPtr(val));
   }
 
   template<typename DataType>
   void Matrix<DataType>::getSym(std::vector<double>& val) const {
-    casadi_assert(val.size()==this->sizeU());
+    val.resize(this->sizeU());
     getSym(getPtr(val));
   }
 

diff --git a/test/python/matrix.py b/test/python/matrix.py
@@ -634,9 +634,8 @@ def test_sparsesym(self):
     self.message("sparsesym")
     D = DMatrix([[1,2,-3],[2,-1,0],[-3,0,5]])
     D = sparsify(D)
-    i = DVector([0]*5)
 
-    D.getSym(i)
+    i = D.getSym()
     #self.checkarray(list(i),[1,2,-1,-3,5])
     A = 2*D
     A.setSym(i)