casadi 3.6.6__cp310-none-manylinux2014_aarch64.whl → 3.7.0__cp310-none-manylinux2014_aarch64.whl

casadi/include/casadi/core/sx.hpp

@@ -64,6 +64,27 @@ template<> inline std::string matrixName<SXElem>() { return "SX"; }
   template<>
   bool SX::is_symbolic() const;
 
+  template<>
+  bool SX::is_call() const;
+
+  template<>
+  std::vector<SXElem> SX::call(const Function& f, const std::vector<SXElem>& dep);
+
+  template<>
+  bool SX::is_output() const;
+
+  template<>
+  bool SX::has_output() const;
+
+  template<>
+  SX SX::get_output(casadi_int oind) const;
+
+  template<>
+  Function SX::which_function() const;
+
+  template<>
+  casadi_int SX::which_output() const;
+
   template<>
   casadi_int SX::op() const;
 
@@ -109,12 +130,28 @@ template<> inline std::string matrixName<SXElem>() { return "SX"; }
   void SX::substitute_inplace(const std::vector<SX>& v, std::vector<SX>& vdef,
                              std::vector<SX>& ex, bool reverse);
 
+  template<>
+  void SX::extract_parametric(const SX &expr, const SX& par,
+      SX& expr_ret, std::vector<SX>& symbols, std::vector<SX>& parametric,
+      const Dict& opts);
+
+  template<>
+  void SX::separate_linear(const SX &expr,
+    const SX &sym_lin, const SX &sym_const,
+    SX& expr_const, SX& expr_lin, SX& expr_nonlin);
+
   template<>
   std::vector<SX> SX::cse(const std::vector<SX>& e);
 
   template<>
   bool SX::depends_on(const SX &x, const SX &arg);
 
+  template<>
+  bool SX::contains_all(const std::vector<SX>& v, const std::vector<SX> &n);
+
+  template<>
+  bool SX::contains_any(const std::vector<SX>& v, const std::vector<SX> &n);
+
   template<>
   SX SX::jacobian(const SX &f, const SX &x, const Dict& opts);
   template<>
@@ -192,6 +229,10 @@ template<> inline std::string matrixName<SXElem>() { return "SX"; }
   void CASADI_EXPORT SX::to_file(const std::string& filename, const Sparsity& sp,
     const SXElem* nonzeros, const std::string& format_hint);
 
+#ifdef CASADI_WITH_THREADSAFE_SYMBOLICS
+  template<>
+  std::mutex& SX::get_mutex_temp();
+#endif // CASADI_WITH_THREADSAFE_SYMBOLICS
 
 #ifndef CASADI_SX_INSTANTIATOR_CPP
   extern template class Matrix<SXElem>;

casadi/include/casadi/core/sx_elem.hpp

@@ -44,6 +44,15 @@
 #include <string>
 #include <vector>
 
+#ifdef CASADI_WITH_THREAD
+#include <atomic>
+#ifdef CASADI_WITH_THREAD_MINGW
+#include <mingw.mutex.h>
+#else // CASADI_WITH_THREAD_MINGW
+#include <mutex>
+#endif // CASADI_WITH_THREAD_MINGW
+#endif //CASADI_WITH_THREAD
+
 namespace casadi {
 
   /** \brief  forward declaration of Node and Matrix
@@ -147,6 +156,7 @@ namespace casadi {
         \identifier{10p} */
     static SXElem binary(casadi_int op, const SXElem& x, const SXElem& y);
     static SXElem unary(casadi_int op, const SXElem& x);
+    static std::vector<SXElem> call(const Function& f, const std::vector<SXElem>& deps);
 
     /** \brief Check the truth value of this node
 
@@ -178,6 +188,11 @@ namespace casadi {
     const std::string& name() const;
     casadi_int op() const;
     bool is_op(casadi_int op) const;
+    bool is_call() const;
+    bool is_output() const;
+    bool has_output() const;
+    Function which_function() const;
+    casadi_int which_output() const;
 
     /// Checks if expression does not contain NaN or Inf
     bool is_regular() const;
@@ -204,6 +219,11 @@ namespace casadi {
         \identifier{10v} */
     casadi_int n_dep() const;
 
+    /** \brief  Get an output
+
+        \identifier{29f} */
+    SXElem get_output(casadi_int oind) const;
+
     /** \brief Returns a number that is unique for a given SXNode.
 
      * If the SXElem does not point to any node, 0 is returned.
@@ -272,6 +292,11 @@ namespace casadi {
     void serialize(SerializingStream& s) const;
 
     static SXElem deserialize(DeserializingStream& s);
+
+#ifdef CASADI_WITH_THREADSAFE_SYMBOLICS
+    static std::mutex mutex_temp;
+#endif //CASADI_WITH_THREADSAFE_SYMBOLICS
+
   private:
     /// Pointer to node (SXElem is only a reference class)
     SXNode* node;

casadi/include/casadi/core/xml_node.hpp

@@ -175,6 +175,11 @@ struct CASADI_EXPORT XmlNode {
       \identifier{vr} */
   static void read(const std::string& str, casadi_int* val);
 
+  /** \brief  Read the size_t value of a string
+
+      \identifier{29u} */
+  static void read(const std::string& str, size_t* val);
+
   /** \brief  Read the double value of a string
 
       \identifier{vs} */