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

casadi/pkgconfig/casadi.pc

@@ -6,7 +6,7 @@ includedir=/work/install/casadi/include
 Name: casadi
 Description: CasADi is a symbolic framework for automatic differentation and numeric optimization
 URL: http://casadi.org
-Version: 3.6.7
+Version: 3.7.1
 Requires: 
 Libs: -L${libdir} -lcasadi
 Cflags: -I${includedir}

casadi/pkgconfig/highs.pc

@@ -5,7 +5,7 @@ includedir=/work/build/external_projects/include/highs
 Name: HiGHS
 Description: Linear Optimization Software
 URL: https://github.com/ERGO-Code/HiGHS
-Version: 1.7.2
+Version: 1.10.0
 Libs: -L${libdir} -lhighs
 #TODO Libs.private (when HiGHS lib is build as static lib)
 Cflags: -I${includedir}

casadi/pkgconfig/libzip.pc

@@ -0,0 +1,14 @@
+prefix=/work/build/external_projects
+exec_prefix=${prefix}
+bindir=${prefix}/bin
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+zipcmp=${bindir}/zipcmp
+
+Name: libzip
+Description: library for handling zip archives
+Version: 1.11.3
+Libs:  -L${libdir} -lzip
+Libs.private:  -ladvapi32 -lzlib
+Cflags: -I${includedir}

casadi/tools/__init__.py

@@ -46,7 +46,9 @@ def loadAllCompiledPlugins():
     if "SKIP_" + name.upper() + "_TESTS" in os.environ:
         print("Skipping")
         continue
-    if cls in ("Importer","XmlFile","Linsol"):
+    if cls in ("XmlFile"):
+      pass
+    elif cls in ("Importer","Linsol"):
       getattr(casadi,cls).load_plugin(name)
     else:
       getattr(casadi,'load_'+cls.lower())(name)

casadi/tools/graph/graph.py

@@ -40,7 +40,7 @@ def print_operator_escaped(expr, strs):
   strs = [ si.replace('<', '{').replace('>', '}') for si in strs ]
   s = print_operator(expr, strs)
   # escape < or >
-  s = s.replace('<', '\<').replace('>', '\>')
+  s = s.replace('<', r'\<').replace('>', r'\>')
   # replace {f} with <f>
   s = s.replace('{', '<').replace('}', '>')
   return s

casadi/tools/structure.py

@@ -94,7 +94,7 @@ def canonical(ind,s):
 
 def vec(e):
   if any(isinstance(i,list) for i in e):
-    return sum(map(vec,e),[])
+    return __builtin__.sum(map(vec,e),[])
   else:
     return e
 
@@ -275,7 +275,7 @@ class Structure(object):
     self.entries = entries
 
     self.order = [e.name for e in self.entries] if order is None else order
-    self.keyslist = sum([ list(i) if isinstance(i,tuple) else list([i]) for i in self.order],[])
+    self.keyslist = __builtin__.sum([ list(i) if isinstance(i,tuple) else list([i]) for i in self.order],[])
 
     self.dict = SafeDict([(e.name,e) for e in self.entries])
 
@@ -774,7 +774,7 @@ class CasadiStructure(Structure,CasadiStructureDerivable):
     self.__init__(*state["args"],**state["kwargs"])
 
   def __getstate__(self):
-    return self.initializer
+    return dict(self.initializer)
 
   def __init__(self,*args,**kwargs):
     self.initializer = {"args": args, "kwargs": kwargs}
@@ -1047,15 +1047,15 @@ class DMStruct(MatrixStruct):
     return self.cat
 
 class SXStruct(MatrixStruct):
-  def __init__(self,struct,data=None):
-    MatrixStruct.__init__(self,struct,SX,data=data)
+  def __init__(self,struct,data=None,order=None):
+    MatrixStruct.__init__(self,struct,SX,data=data,order=order)
 
   def __SX__(self):
     return self.cat
 
 class MXStruct(MatrixStruct,VertsplitStructure):
-  def __init__(self,struct,data=None):
-    MatrixStruct.__init__(self,struct,MX,data=data)
+  def __init__(self,struct,data=None,order=None):
+    MatrixStruct.__init__(self,struct,MX,data=data,order=order)
 
     self.buildMap()
 

{casadi-3.6.7.dist-info → casadi-3.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: casadi
-Version: 3.6.7
+Version: 3.7.1
 Summary: CasADi -- framework for algorithmic differentiation and numeric optimization
 Home-page: http://casadi.org
 Author: Joel Andersson, Joris Gillis, Greg Horn