Changeset 13698

Timestamp:

Oct 8, 2019 4:03:53 PM (2 months ago)

Author:

randersson

Message:

#5819 Replaced toString(...) with toPyUnicode(...) in order to test if this resolve the issue with building ModelicaCasADiInterface using a JCC compatible with Python 3. The switch to toPyUnicode is based on using diff on JCCEnv.h from the two different jcc versions. Note that this change is not Python 2 compatible, but, is for testing if it resolves the current build issue.

Location:

branches/dev-5819/ModelicaCasADiInterface/src

Files:

• CompilerOptionsWrapper.cpp (modified) (4 diffs)
• sharedTransferFunctionality.hpp (modified) (7 diffs)
• transferModelica.cpp (modified) (1 diff)
• transferOptimica.cpp (modified) (1 diff)

branches/dev-5819/ModelicaCasADiInterface/src/CompilerOptionsWrapper.cpp

@@ -69 +69 @@
         while(iter.hasNext()){
             java::lang::String key(iter.next().this$);
-            out <<"\033[31m"<<env->toString(key.this$) <<"\033[0m"<< ": ";
-            out << env->toString(optr.getDescription(key).this$);
+            out <<"\033[31m"<<env->toPyUnicode(key.this$) <<"\033[0m"<< ": ";
+            out << env->toPyUnicode(optr.getDescription(key).this$);
             out << "\n";
         }
@@ -89 +89 @@
 }
 
-void ModelicaOptionsWrapper::print(std::ostream& os) const { os << "ModelicaOptionsWrapper(" << env->toString(optr.this$) << ")"; }
+void ModelicaOptionsWrapper::print(std::ostream& os) const { os << "ModelicaOptionsWrapper(" << env->toPyUnicode(optr.this$) << ")"; }
 
 void OptimicaOptionsWrapper::setStringOption(std::string opt, std::string val) {
@@ -130 +130 @@
         while(iter.hasNext()){
             java::lang::String key(iter.next().this$);
-            out <<"\033[31m"<<env->toString(key.this$) <<"\033[0m"<< ": ";
-            out << env->toString(optr.getDescription(key).this$);
+            out <<"\033[31m"<<env->toPyUnicode(key.this$) <<"\033[0m"<< ": ";
+            out << env->toPyUnicode(optr.getDescription(key).this$);
             out << "\n";
         }
@@ -150 +150 @@
 }
 
-void OptimicaOptionsWrapper::print(std::ostream& os) const { os << "OptimicaOptionsWrapper(" << env->toString(optr.this$) << ")"; }
+void OptimicaOptionsWrapper::print(std::ostream& os) const { os << "OptimicaOptionsWrapper(" << env->toPyUnicode(optr.this$) << ")"; }
 }; // End namespace

branches/dev-5819/ModelicaCasADiInterface/src/sharedTransferFunctionality.hpp

@@ -314 +314 @@
         AbstractEquation eq = AbstractEquation(equationList.get(i).this$);
         if (eq.isIgnoredForCasADi()) {
-            char *str = env->toString(eq.this$);
+            char *str = env->toPyUnicode(eq.this$);
             std::cerr << "Warning: Ignored equation:\n" << str << std::endl;
             delete[] str;
@@ -448 +448 @@
     if(fv.hasFStringComment()) {
         Comment comment = Comment(fv.getFStringComment().this$);
-        var->setAttribute("comment", casadi::MX::sym(env->toString(comment.getComment().this$)));
+        var->setAttribute("comment", casadi::MX::sym(env->toPyUnicode(comment.getComment().this$)));
     }
 }
@@ -466 +466 @@
     for (int i = 0; i < attributeList.getNumChild(); ++i) {
         attr = Attribute(attributeList.getChild(i).this$);
-        std::string name = env->toString(attr.name().this$);
+        std::string name = env->toPyUnicode(attr.name().this$);
         if (name != "stateSelect" && name.find("__") != 0) {
             // Don't transfer stateSelect attribute, since enumerations are not supported
@@ -561 +561 @@
     List attributeList = derivedType.getFAttributes();
     Attribute  attr;
-    std::string typeName = env->toString(derivedType.getName().this$);
-    std::string baseTypeName = env->toString((Type(derivedType.getBaseType().this$)).toString().this$);
+    std::string typeName = env->toPyUnicode(derivedType.getName().this$);
+    std::string baseTypeName = env->toPyUnicode((Type(derivedType.getBaseType().this$)).toPyUnicode().this$);
     ModelicaCasADi::Ref<ModelicaCasADi::UserType> userType = new ModelicaCasADi::UserType(typeName, getBaseTypeForDerivedType(m, baseTypeName));
     for (int i = 0; i < attributeList.getNumChild(); ++i) {
         attr = Attribute(attributeList.getChild(i).this$);
-        userType->setAttribute(env->toString(attr.name().this$), toMX(attr.getValue()));
+        userType->setAttribute(env->toPyUnicode(attr.name().this$), toMX(attr.getValue()));
     }
     m->addNewVariableType(userType);
@@ -607 +607 @@
 {
     ModelicaCasADi::Ref<ModelicaCasADi::UserType> userType;
-    if (!std::string(env->toString(fv.getDerivedType().this$)).empty()) {
-        userType = (ModelicaCasADi::UserType*) m->getVariableType(env->toString(fv.getDerivedType().this$)).getNode();
+    if (!std::string(env->toPyUnicode(fv.getDerivedType().this$)).empty()) {
+        userType = (ModelicaCasADi::UserType*) m->getVariableType(env->toPyUnicode(fv.getDerivedType().this$)).getNode();
         if(userType.getNode() == NULL) {
             throw std::runtime_error("Variable's derived type not present in Model when Variable transferred");
@@ -693 +693 @@
     }
     
-    std::string aliasName = env->toString(fv.alias().name().this$);
+    std::string aliasName = env->toPyUnicode(fv.alias().name().this$);
     ModelicaCasADi::Ref<ModelicaCasADi::Variable> aliasVariable = m->getVariable(aliasName);
     if (aliasVariable == NULL) {
@@ -725 +725 @@
         FVar var = FVar(vars.get(i).this$);
         if (var.type().isEnum()) {
-            char *str = env->toString(var.this$);
+            char *str = env->toPyUnicode(var.this$);
             std::cerr << "Warning: Ignored enumeration typed variable:\n" << str << std::endl;
             delete[] str;

branches/dev-5819/ModelicaCasADiInterface/src/transferModelica.cpp

@@ -174 +174 @@
             StringFromUTF(modelName.c_str()));
 
-        std::string identfier = env->toString(fclass.nameUnderscore().this$);
+        std::string identfier = env->toPyUnicode(fclass.nameUnderscore().this$);
         // Initialize the model with the model identfier.
         m->initializeModel(identfier);

branches/dev-5819/ModelicaCasADiInterface/src/transferOptimica.cpp

@@ -172 +172 @@
                 StringFromUTF(modelName.c_str())).this$);
 
-            std::string identfier = env->toString(fclass.nameUnderscore().this$);
+            std::string identfier = env->toPyUnicode(fclass.nameUnderscore().this$);
             std::string option = "normalize_minimum_time_problems";
             bool normalizedTime = fclass.myOptions().getBooleanOption(StringFromUTF(option.c_str()));