casadi 3.6.7__cp27-none-manylinux1_i686.whl → 3.7.1__cp27-none-manylinux1_i686.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (210) hide show
  1. casadi/_casadi.so +0 -0
  2. casadi/casadi-cli +0 -0
  3. casadi/casadi.py +6529 -3037
  4. casadi/cbc +0 -0
  5. casadi/clp +0 -0
  6. casadi/cmake/casadi-config-version.cmake +1 -1
  7. casadi/cmake/casadi-config.cmake +1 -1
  8. casadi/cmake/casadi-targets-release.cmake +5 -5
  9. casadi/cmake/casadi-targets.cmake +5 -5
  10. casadi/{lib/cmake/tinyxml2/tinyxml2-config-version.cmake → cmake/libzip/libzip-config-version.cmake} +4 -18
  11. casadi/cmake/libzip/libzip-config.cmake +69 -0
  12. casadi/cmake/libzip/libzip-targets-release.cmake +19 -0
  13. casadi/{lib/cmake/tinyxml2/tinyxml2-static-targets.cmake → cmake/libzip/libzip-targets.cmake} +11 -7
  14. casadi/cmake/libzip/modules/FindMbedTLS.cmake +141 -0
  15. casadi/cmake/libzip/modules/FindNettle.cmake +141 -0
  16. casadi/cmake/libzip/modules/Findzstd.cmake +186 -0
  17. casadi/include/casadi/casadi.i +276 -47
  18. casadi/include/casadi/config.h +11 -11
  19. casadi/include/casadi/core/archiver.hpp +58 -0
  20. casadi/include/casadi/core/blazing_spline.hpp +47 -0
  21. casadi/include/casadi/core/calculus.hpp +57 -2
  22. casadi/include/casadi/core/callback.hpp +9 -0
  23. casadi/include/casadi/core/casadi_common.hpp +37 -0
  24. casadi/include/casadi/core/casadi_meta.hpp +15 -0
  25. casadi/include/casadi/core/casadi_misc.hpp +21 -0
  26. casadi/include/casadi/core/code_generator.hpp +115 -19
  27. casadi/include/casadi/core/core.hpp +5 -0
  28. casadi/include/casadi/core/dae_builder.hpp +303 -141
  29. casadi/include/casadi/core/dm.hpp +3 -0
  30. casadi/include/casadi/core/filesystem.hpp +58 -0
  31. casadi/include/casadi/core/fmu.hpp +62 -16
  32. casadi/include/casadi/core/function.hpp +24 -0
  33. casadi/include/casadi/core/generic_matrix.hpp +214 -7
  34. casadi/include/casadi/core/generic_shared.hpp +395 -0
  35. casadi/include/casadi/core/generic_shared_impl.hpp +218 -0
  36. casadi/include/casadi/core/generic_shared_internal.hpp +215 -0
  37. casadi/include/casadi/core/generic_type.hpp +3 -0
  38. casadi/include/casadi/core/global_options.hpp +10 -0
  39. casadi/include/casadi/core/integrator.hpp +41 -7
  40. casadi/include/casadi/core/matrix_decl.hpp +71 -0
  41. casadi/include/casadi/core/mx.hpp +63 -2
  42. casadi/include/casadi/core/nlp_builder.hpp +2 -1
  43. casadi/include/casadi/core/options.hpp +6 -3
  44. casadi/include/casadi/core/optistack.hpp +43 -9
  45. casadi/include/casadi/core/printable.hpp +8 -0
  46. casadi/include/casadi/core/resource.hpp +107 -0
  47. casadi/include/casadi/core/runtime/casadi_blazing_1d_boor_eval.hpp +112 -0
  48. casadi/include/casadi/core/runtime/casadi_blazing_2d_boor_eval.hpp +311 -0
  49. casadi/include/casadi/core/runtime/casadi_blazing_3d_boor_eval.hpp +645 -0
  50. casadi/include/casadi/core/runtime/casadi_blazing_de_boor.hpp +101 -0
  51. casadi/include/casadi/core/runtime/casadi_finite_diff.hpp +1 -1
  52. casadi/include/casadi/core/runtime/casadi_nlp.hpp +8 -2
  53. casadi/include/casadi/core/runtime/casadi_print_canonical.hpp +55 -0
  54. casadi/include/casadi/core/runtime/casadi_print_scalar.hpp +25 -0
  55. casadi/include/casadi/core/runtime/casadi_print_vector.hpp +32 -0
  56. casadi/include/casadi/core/runtime/casadi_printme.hpp +26 -0
  57. casadi/include/casadi/core/serializer.hpp +13 -5
  58. casadi/include/casadi/core/serializing_stream.hpp +9 -2
  59. casadi/include/casadi/core/shared_object.hpp +73 -161
  60. casadi/include/casadi/core/sparsity.hpp +13 -1
  61. casadi/include/casadi/core/sparsity_interface.hpp +19 -1
  62. casadi/include/casadi/core/sx.hpp +41 -0
  63. casadi/include/casadi/core/sx_elem.hpp +25 -0
  64. casadi/include/casadi/core/xml_node.hpp +5 -0
  65. casadi/include/casadi/doc.i +10026 -6513
  66. casadi/include/casadi/doc_merged.i +6744 -4449
  67. casadi/include/casadi/valgrind-casadi.supp +138 -0
  68. casadi/include/casadi/valgrind-python.supp +2470 -0
  69. casadi/include/licenses/libz-external/LICENSE +22 -0
  70. casadi/include/licenses/libz-external/contrib/dotzlib/LICENSE_1_0.txt +23 -0
  71. casadi/include/licenses/libzip-external/LICENSE +31 -0
  72. casadi/libCbcSolver.so +0 -0
  73. casadi/libCbcSolver.so.3 +0 -0
  74. casadi/libCbcSolver.so.3.10.11 +0 -0
  75. casadi/libClpSolver.so +0 -0
  76. casadi/libClpSolver.so.1 +0 -0
  77. casadi/libClpSolver.so.1.14.9 +0 -0
  78. casadi/libbonmin.so +0 -0
  79. casadi/libbonmin.so.4 +0 -0
  80. casadi/libbonmin.so.4.8.9 +0 -0
  81. casadi/libcasadi.so +0 -0
  82. casadi/libcasadi.so.3.7 +0 -0
  83. casadi/libcasadi_archiver_libzip.so +0 -0
  84. casadi/libcasadi_archiver_libzip.so.3.7 +0 -0
  85. casadi/libcasadi_conic_cbc.so +0 -0
  86. casadi/libcasadi_conic_cbc.so.3.7 +0 -0
  87. casadi/libcasadi_conic_clp.so +0 -0
  88. casadi/libcasadi_conic_clp.so.3.7 +0 -0
  89. casadi/libcasadi_conic_daqp.so +0 -0
  90. casadi/libcasadi_conic_daqp.so.3.7 +0 -0
  91. casadi/libcasadi_conic_gurobi.so +0 -0
  92. casadi/libcasadi_conic_gurobi.so.3.7 +0 -0
  93. casadi/libcasadi_conic_ipqp.so +0 -0
  94. casadi/libcasadi_conic_ipqp.so.3.7 +0 -0
  95. casadi/libcasadi_conic_nlpsol.so +0 -0
  96. casadi/libcasadi_conic_nlpsol.so.3.7 +0 -0
  97. casadi/libcasadi_conic_osqp.so +0 -0
  98. casadi/libcasadi_conic_osqp.so.3.7 +0 -0
  99. casadi/libcasadi_conic_qpoases.so +0 -0
  100. casadi/libcasadi_conic_qpoases.so.3.7 +0 -0
  101. casadi/libcasadi_conic_qrqp.so +0 -0
  102. casadi/libcasadi_conic_qrqp.so.3.7 +0 -0
  103. casadi/libcasadi_conic_superscs.so +0 -0
  104. casadi/libcasadi_conic_superscs.so.3.7 +0 -0
  105. casadi/libcasadi_importer_shell.so +0 -0
  106. casadi/libcasadi_importer_shell.so.3.7 +0 -0
  107. casadi/libcasadi_integrator_collocation.so +0 -0
  108. casadi/libcasadi_integrator_collocation.so.3.7 +0 -0
  109. casadi/libcasadi_integrator_cvodes.so +0 -0
  110. casadi/libcasadi_integrator_cvodes.so.3.7 +0 -0
  111. casadi/libcasadi_integrator_idas.so +0 -0
  112. casadi/libcasadi_integrator_idas.so.3.7 +0 -0
  113. casadi/libcasadi_integrator_rk.so +0 -0
  114. casadi/libcasadi_integrator_rk.so.3.7 +0 -0
  115. casadi/libcasadi_interpolant_bspline.so +0 -0
  116. casadi/libcasadi_interpolant_bspline.so.3.7 +0 -0
  117. casadi/libcasadi_interpolant_linear.so +0 -0
  118. casadi/libcasadi_interpolant_linear.so.3.7 +0 -0
  119. casadi/libcasadi_linsol_csparse.so +0 -0
  120. casadi/libcasadi_linsol_csparse.so.3.7 +0 -0
  121. casadi/libcasadi_linsol_csparsecholesky.so +0 -0
  122. casadi/libcasadi_linsol_csparsecholesky.so.3.7 +0 -0
  123. casadi/libcasadi_linsol_lapacklu.so +0 -0
  124. casadi/libcasadi_linsol_lapacklu.so.3.7 +0 -0
  125. casadi/libcasadi_linsol_lapackqr.so +0 -0
  126. casadi/libcasadi_linsol_lapackqr.so.3.7 +0 -0
  127. casadi/libcasadi_linsol_ldl.so +0 -0
  128. casadi/libcasadi_linsol_ldl.so.3.7 +0 -0
  129. casadi/libcasadi_linsol_lsqr.so +0 -0
  130. casadi/libcasadi_linsol_lsqr.so.3.7 +0 -0
  131. casadi/libcasadi_linsol_ma27.so +0 -0
  132. casadi/libcasadi_linsol_ma27.so.3.7 +0 -0
  133. casadi/libcasadi_linsol_mumps.so +0 -0
  134. casadi/libcasadi_linsol_mumps.so.3.7 +0 -0
  135. casadi/libcasadi_linsol_qr.so +0 -0
  136. casadi/libcasadi_linsol_qr.so.3.7 +0 -0
  137. casadi/libcasadi_linsol_symbolicqr.so +0 -0
  138. casadi/libcasadi_linsol_symbolicqr.so.3.7 +0 -0
  139. casadi/libcasadi_linsol_tridiag.so +0 -0
  140. casadi/libcasadi_linsol_tridiag.so.3.7 +0 -0
  141. casadi/libcasadi_nlpsol_ampl.so +0 -0
  142. casadi/libcasadi_nlpsol_ampl.so.3.7 +0 -0
  143. casadi/libcasadi_nlpsol_blocksqp.so +0 -0
  144. casadi/libcasadi_nlpsol_blocksqp.so.3.7 +0 -0
  145. casadi/libcasadi_nlpsol_bonmin.so +0 -0
  146. casadi/libcasadi_nlpsol_bonmin.so.3.7 +0 -0
  147. casadi/libcasadi_nlpsol_feasiblesqpmethod.so +0 -0
  148. casadi/libcasadi_nlpsol_feasiblesqpmethod.so.3.7 +0 -0
  149. casadi/libcasadi_nlpsol_ipopt.so +0 -0
  150. casadi/libcasadi_nlpsol_ipopt.so.3.7 +0 -0
  151. casadi/libcasadi_nlpsol_knitro.so +0 -0
  152. casadi/libcasadi_nlpsol_knitro.so.3.7 +0 -0
  153. casadi/libcasadi_nlpsol_madnlp.so +0 -0
  154. casadi/libcasadi_nlpsol_madnlp.so.3.7 +0 -0
  155. casadi/libcasadi_nlpsol_qrsqp.so +0 -0
  156. casadi/libcasadi_nlpsol_qrsqp.so.3.7 +0 -0
  157. casadi/libcasadi_nlpsol_scpgen.so +0 -0
  158. casadi/libcasadi_nlpsol_scpgen.so.3.7 +0 -0
  159. casadi/libcasadi_nlpsol_snopt.so +0 -0
  160. casadi/libcasadi_nlpsol_snopt.so.3.7 +0 -0
  161. casadi/libcasadi_nlpsol_sqpmethod.so +0 -0
  162. casadi/libcasadi_nlpsol_sqpmethod.so.3.7 +0 -0
  163. casadi/libcasadi_nlpsol_worhp.so +0 -0
  164. casadi/libcasadi_nlpsol_worhp.so.3.7 +0 -0
  165. casadi/libcasadi_rootfinder_fast_newton.so +0 -0
  166. casadi/libcasadi_rootfinder_fast_newton.so.3.7 +0 -0
  167. casadi/libcasadi_rootfinder_kinsol.so +0 -0
  168. casadi/libcasadi_rootfinder_kinsol.so.3.7 +0 -0
  169. casadi/libcasadi_rootfinder_newton.so +0 -0
  170. casadi/libcasadi_rootfinder_newton.so.3.7 +0 -0
  171. casadi/libcasadi_rootfinder_nlpsol.so +0 -0
  172. casadi/libcasadi_rootfinder_nlpsol.so.3.7 +0 -0
  173. casadi/libcasadi_sundials_common.so +0 -0
  174. casadi/libcasadi_sundials_common.so.3.7 +0 -0
  175. casadi/libcasadi_xmlfile_tinyxml.so +0 -0
  176. casadi/libcasadi_xmlfile_tinyxml.so.3.7 +0 -0
  177. casadi/libcoinmumps.so +0 -0
  178. casadi/libcoinmumps.so.3 +0 -0
  179. casadi/libcoinmumps.so.3.0.1 +0 -0
  180. casadi/libdaqpstat.a +0 -0
  181. casadi/libindirect.a +0 -0
  182. casadi/libipopt.so +0 -0
  183. casadi/libipopt.so.3 +0 -0
  184. casadi/libipopt.so.3.14.11 +0 -0
  185. casadi/liblinsys.a +0 -0
  186. casadi/libosqp.a +0 -0
  187. casadi/libqdldl.a +0 -0
  188. casadi/libsipopt.so +0 -0
  189. casadi/libsipopt.so.3 +0 -0
  190. casadi/libsipopt.so.3.14.11 +0 -0
  191. casadi/libsuperscs.a +0 -0
  192. casadi/libz.a +0 -0
  193. casadi/libz.so +0 -0
  194. casadi/libz.so.1 +0 -0
  195. casadi/libz.so.1.3.1 +0 -0
  196. casadi/libzip.a +0 -0
  197. casadi/pkgconfig/casadi.pc +1 -1
  198. casadi/pkgconfig/libzip.pc +14 -0
  199. casadi/tools/__init__.py +3 -1
  200. casadi/tools/graph/graph.py +1 -1
  201. casadi/tools/structure.py +7 -7
  202. {casadi-3.6.7.dist-info → casadi-3.7.1.dist-info}/METADATA +1 -1
  203. {casadi-3.6.7.dist-info → casadi-3.7.1.dist-info}/RECORD +203 -178
  204. casadi/include/tinyxml2.h +0 -2380
  205. casadi/lib/cmake/tinyxml2/tinyxml2-config.cmake +0 -57
  206. casadi/lib/cmake/tinyxml2/tinyxml2-static-targets-release.cmake +0 -19
  207. casadi/lib/libtinyxml2.a +0 -0
  208. casadi/lib/pkgconfig/tinyxml2.pc +0 -10
  209. casadi/tools/structure3.py +0 -1441
  210. {casadi-3.6.7.dist-info → casadi-3.7.1.dist-info}/WHEEL +0 -0
@@ -0,0 +1,22 @@
1
+ Copyright notice:
2
+
3
+ (C) 1995-2022 Jean-loup Gailly and Mark Adler
4
+
5
+ This software is provided 'as-is', without any express or implied
6
+ warranty. In no event will the authors be held liable for any damages
7
+ arising from the use of this software.
8
+
9
+ Permission is granted to anyone to use this software for any purpose,
10
+ including commercial applications, and to alter it and redistribute it
11
+ freely, subject to the following restrictions:
12
+
13
+ 1. The origin of this software must not be misrepresented; you must not
14
+ claim that you wrote the original software. If you use this software
15
+ in a product, an acknowledgment in the product documentation would be
16
+ appreciated but is not required.
17
+ 2. Altered source versions must be plainly marked as such, and must not be
18
+ misrepresented as being the original software.
19
+ 3. This notice may not be removed or altered from any source distribution.
20
+
21
+ Jean-loup Gailly Mark Adler
22
+ jloup@gzip.org madler@alumni.caltech.edu
@@ -0,0 +1,23 @@
1
+ Boost Software License - Version 1.0 - August 17th, 2003
2
+
3
+ Permission is hereby granted, free of charge, to any person or organization
4
+ obtaining a copy of the software and accompanying documentation covered by
5
+ this license (the "Software") to use, reproduce, display, distribute,
6
+ execute, and transmit the Software, and to prepare derivative works of the
7
+ Software, and to permit third-parties to whom the Software is furnished to
8
+ do so, all subject to the following:
9
+
10
+ The copyright notices in the Software and this entire statement, including
11
+ the above license grant, this restriction and the following disclaimer,
12
+ must be included in all copies of the Software, in whole or in part, and
13
+ all derivative works of the Software, unless such copies or derivative
14
+ works are solely in the form of machine-executable object code generated by
15
+ a source language processor.
16
+
17
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
20
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
21
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
22
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23
+ DEALINGS IN THE SOFTWARE.
@@ -0,0 +1,31 @@
1
+ Copyright (C) 1999-2020 Dieter Baron and Thomas Klausner
2
+
3
+ The authors can be contacted at <info@libzip.org>
4
+
5
+ Redistribution and use in source and binary forms, with or without
6
+ modification, are permitted provided that the following conditions
7
+ are met:
8
+
9
+ 1. Redistributions of source code must retain the above copyright
10
+ notice, this list of conditions and the following disclaimer.
11
+
12
+ 2. Redistributions in binary form must reproduce the above copyright
13
+ notice, this list of conditions and the following disclaimer in
14
+ the documentation and/or other materials provided with the
15
+ distribution.
16
+
17
+ 3. The names of the authors may not be used to endorse or promote
18
+ products derived from this software without specific prior
19
+ written permission.
20
+
21
+ THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
22
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
23
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
25
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
27
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
29
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
30
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
31
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
casadi/libCbcSolver.so CHANGED
Binary file
casadi/libCbcSolver.so.3 CHANGED
Binary file
Binary file
casadi/libClpSolver.so CHANGED
Binary file
casadi/libClpSolver.so.1 CHANGED
Binary file
Binary file
casadi/libbonmin.so CHANGED
Binary file
casadi/libbonmin.so.4 CHANGED
Binary file
casadi/libbonmin.so.4.8.9 CHANGED
Binary file
casadi/libcasadi.so CHANGED
Binary file
casadi/libcasadi.so.3.7 CHANGED
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
casadi/libcoinmumps.so CHANGED
Binary file
casadi/libcoinmumps.so.3 CHANGED
Binary file
Binary file
casadi/libdaqpstat.a CHANGED
Binary file
casadi/libindirect.a CHANGED
Binary file
casadi/libipopt.so CHANGED
Binary file
casadi/libipopt.so.3 CHANGED
Binary file
Binary file
casadi/liblinsys.a CHANGED
Binary file
casadi/libosqp.a CHANGED
Binary file
casadi/libqdldl.a CHANGED
Binary file
casadi/libsipopt.so CHANGED
Binary file
casadi/libsipopt.so.3 CHANGED
Binary file
Binary file
casadi/libsuperscs.a CHANGED
Binary file
casadi/libz.a ADDED
Binary file
casadi/libz.so ADDED
Binary file
casadi/libz.so.1 ADDED
Binary file
casadi/libz.so.1.3.1 ADDED
Binary file
casadi/libzip.a ADDED
Binary file
@@ -6,7 +6,7 @@ includedir=/work/install/casadi/include
6
6
  Name: casadi
7
7
  Description: CasADi is a symbolic framework for automatic differentation and numeric optimization
8
8
  URL: http://casadi.org
9
- Version: 3.6.7
9
+ Version: 3.7.1
10
10
  Requires:
11
11
  Libs: -L${libdir} -lcasadi
12
12
  Cflags: -I${includedir}
@@ -0,0 +1,14 @@
1
+ prefix=/work/build/external_projects
2
+ exec_prefix=${prefix}
3
+ bindir=${prefix}/bin
4
+ libdir=${prefix}/lib
5
+ includedir=${prefix}/include
6
+
7
+ zipcmp=${bindir}/zipcmp
8
+
9
+ Name: libzip
10
+ Description: library for handling zip archives
11
+ Version: 1.11.3
12
+ Libs: -L${libdir} -lzip
13
+ Libs.private: -lz
14
+ Cflags: -I${includedir}
casadi/tools/__init__.py CHANGED
@@ -46,7 +46,9 @@ def loadAllCompiledPlugins():
46
46
  if "SKIP_" + name.upper() + "_TESTS" in os.environ:
47
47
  print("Skipping")
48
48
  continue
49
- if cls in ("Importer","XmlFile","Linsol"):
49
+ if cls in ("XmlFile"):
50
+ pass
51
+ elif cls in ("Importer","Linsol"):
50
52
  getattr(casadi,cls).load_plugin(name)
51
53
  else:
52
54
  getattr(casadi,'load_'+cls.lower())(name)
@@ -40,7 +40,7 @@ def print_operator_escaped(expr, strs):
40
40
  strs = [ si.replace('<', '{').replace('>', '}') for si in strs ]
41
41
  s = print_operator(expr, strs)
42
42
  # escape < or >
43
- s = s.replace('<', '\<').replace('>', '\>')
43
+ s = s.replace('<', r'\<').replace('>', r'\>')
44
44
  # replace {f} with <f>
45
45
  s = s.replace('{', '<').replace('}', '>')
46
46
  return s
casadi/tools/structure.py CHANGED
@@ -94,7 +94,7 @@ def canonical(ind,s):
94
94
 
95
95
  def vec(e):
96
96
  if any(isinstance(i,list) for i in e):
97
- return sum(map(vec,e),[])
97
+ return __builtin__.sum(map(vec,e),[])
98
98
  else:
99
99
  return e
100
100
 
@@ -275,7 +275,7 @@ class Structure(object):
275
275
  self.entries = entries
276
276
 
277
277
  self.order = [e.name for e in self.entries] if order is None else order
278
- self.keyslist = sum([ list(i) if isinstance(i,tuple) else list([i]) for i in self.order],[])
278
+ self.keyslist = __builtin__.sum([ list(i) if isinstance(i,tuple) else list([i]) for i in self.order],[])
279
279
 
280
280
  self.dict = SafeDict([(e.name,e) for e in self.entries])
281
281
 
@@ -774,7 +774,7 @@ class CasadiStructure(Structure,CasadiStructureDerivable):
774
774
  self.__init__(*state["args"],**state["kwargs"])
775
775
 
776
776
  def __getstate__(self):
777
- return self.initializer
777
+ return dict(self.initializer)
778
778
 
779
779
  def __init__(self,*args,**kwargs):
780
780
  self.initializer = {"args": args, "kwargs": kwargs}
@@ -1047,15 +1047,15 @@ class DMStruct(MatrixStruct):
1047
1047
  return self.cat
1048
1048
 
1049
1049
  class SXStruct(MatrixStruct):
1050
- def __init__(self,struct,data=None):
1051
- MatrixStruct.__init__(self,struct,SX,data=data)
1050
+ def __init__(self,struct,data=None,order=None):
1051
+ MatrixStruct.__init__(self,struct,SX,data=data,order=order)
1052
1052
 
1053
1053
  def __SX__(self):
1054
1054
  return self.cat
1055
1055
 
1056
1056
  class MXStruct(MatrixStruct,VertsplitStructure):
1057
- def __init__(self,struct,data=None):
1058
- MatrixStruct.__init__(self,struct,MX,data=data)
1057
+ def __init__(self,struct,data=None,order=None):
1058
+ MatrixStruct.__init__(self,struct,MX,data=data,order=order)
1059
1059
 
1060
1060
  self.buildMap()
1061
1061
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: casadi
3
- Version: 3.6.7
3
+ Version: 3.7.1
4
4
  Summary: CasADi -- framework for algorithmic differentiation and numeric optimization
5
5
  Home-page: http://casadi.org
6
6
  Author: Joel Andersson, Joris Gillis, Greg Horn