Changeset 13290

Timestamp:

2012-10-10T11:38:52+02:00 (12 years ago)

Author:

hubert.thieriot

Message:

• moomc get comment function
• optobjective filled fields

Location:

trunk/OMOptim

Files:

• Core/OMC/MOomc.cpp (modified) (1 diff)
• Core/OptObjective.cpp (modified) (2 diffs)
• Core/Problems/OptimResult.cpp (modified) (2 diffs)
• Core/Problems/OptimResult.h (modified) (1 diff)
• GUI/Tabs/TabResOptimization.cpp (modified) (1 diff)

trunk/OMOptim/Core/OMC/MOomc.cpp

@@ -651 +651 @@
     //  {{Modelica.SIunits.Temp_K,TorcH,"ORC hot temperature (K)", "public", false, false, false, false, "parameter", "none", "unspecified",{}},{Modelica.SIunits.Temp_K,TorcC,"ORC cold temperature (K)", "public", false, false, false, false, "parameter", "none", "unspecified",{}}}
 
-    QRegExp rexp(".*"+compName+","+"\"\\(.*\\)\"(\\.*)");
+    QRegExp rexp(".*"+compName+","+"\"(.*)\"");
     rexp.setMinimal(true);
     if(commandRes.contains(rexp)&&rexp.capturedTexts().size()>1)

trunk/OMOptim/Core/OptObjective.cpp

@@ -51 +51 @@
 OptObjective::OptObjective(const Variable &var, OptObjective::Direction direction):Variable(var)
 {
+    // problem: fields doesnt have proper correspondence
+    // filledFields is not consistent after Variable(var)
+    for(int i=0;i<this->getNbFields();i++)
+        if(_filledFields.contains(i))
+            _filledFields.push_back(i);
+
     setFieldValue(OptObjective::DIRECTION,direction);
     _scanFunction = NONE;
@@ -64 +70 @@
     _min = obj._min;
     _max = obj._max;
+    _filledFields = obj._filledFields;
 }
 

trunk/OMOptim/Core/Problems/OptimResult.cpp

@@ -336 +336 @@
 
             CSVBase::FileToVariableResult(_recomputedVariables,iPoint,pointFolder+QDir::separator()+"resultVar.csv");
-            //int iRecVar;
-            //            for(int iCurVar=0;iCurVar<pointVariables->size();iCurVar++)
-            //            {
-            //                //set value
-            //                iRecVar = _recomputedVariables->findItem(pointVariables->at(iCurVar)->getFieldValue(Variable::NAME).toString());
-            //                if(iRecVar>-1)
-            //                    _recomputedVariables->at(iRecVar)->setFinalValueAtPoint(
-            //                            pointVariables->at(iCurVar)->getFieldValue(Variable::VALUE).toDouble(),iPoint);
-            //                else
-            //                {
-            //                    // variable found in file does not exist in _recomputedVariables
-            //                    // add it
-            //                    newVariableResult =  new VariableResult(*pointVariables->at(iCurVar));
-            //                    newVariableResult->setFinalValueAtPoint(iPoint,
-            //                                                            pointVariables->at(iCurVar)->getFieldValue(Variable::VALUE).toDouble());
-            //                    _recomputedVariables->addItem(newVariableResult);
-
-            //                    // display info
-            //                    QString msg;
-            //                    msg.sprintf("Variable %s added in recomputed variables list",
-            //                                newVariableResult->getFieldValue(VariableResult::NAME).toString().utf16());
-            //                    InfoSender::instance()->send(Info(msg,ListInfo::NORMAL2));
-            //                }
-            //            }
         }
     }
@@ -698 +674 @@
 }
 
+int OptimResult::nbPoints()
+{
+    return _optVariablesResults->nbPoints();
+}
+

trunk/OMOptim/Core/Problems/OptimResult.h

@@ -94 +94 @@
 
 
+    int nbPoints();
     void setCurPoint(int);
     int curPoint();

trunk/OMOptim/GUI/Tabs/TabResOptimization.cpp

@@ -142 +142 @@
          readGUIState();
 
+//         // select first point
+//         if(result->nbPoints()>0)
+//             _widgetMooPointsList->_listPoints->setSelectedIndexes(QList<int>()<<0);
+
 }