- undo changes in initialization.c from last commit

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11945 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 24, 2012 · 5c26799 · 5c26799
1 parent 271ff37
commit 5c26799
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/SimulationRuntime/c/simulation/solver/initialization.c b/SimulationRuntime/c/simulation/solver/initialization.c
@@ -147,8 +147,8 @@ double leastSquareWithLambda(DATA* data, INIT_DATA* initData, double lambda)
 
     if(initData->residualScalingCoefficients[i] > 0.0)
       funcValue += (initData->initialResiduals[i] / scalingCoefficient) * (initData->initialResiduals[i] / scalingCoefficient);
-    else
-      funcValue += initData->initialResiduals[i] * initData->initialResiduals[i];
+    /*else
+      funcValue += initData->initialResiduals[i] * initData->initialResiduals[i];*/
   }
 
   if(lambda < 1.0)
@@ -166,8 +166,8 @@ double leastSquareWithLambda(DATA* data, INIT_DATA* initData, double lambda)
 
         if(scalingCoefficient > 0.0)
           funcValue += (1.0-lambda)*((data->modelData.realVarsData[i].attribute.start-data->localData[0]->realVars[i])/scalingCoefficient)*((data->modelData.realVarsData[i].attribute.start-data->localData[0]->realVars[i])/scalingCoefficient);
-        else
-          funcValue += (1.0-lambda)*(data->modelData.realVarsData[i].attribute.start-data->localData[0]->realVars[i])*(data->modelData.realVarsData[i].attribute.start-data->localData[0]->realVars[i]);
+        /*else
+          funcValue += (1.0-lambda)*(data->modelData.realVarsData[i].attribute.start-data->localData[0]->realVars[i])*(data->modelData.realVarsData[i].attribute.start-data->localData[0]->realVars[i]);*/
       }
 
     /* for real parameters */
@@ -181,8 +181,8 @@ double leastSquareWithLambda(DATA* data, INIT_DATA* initData, double lambda)
 
         if(scalingCoefficient > 0.0)
           funcValue += (1.0-lambda)*((data->modelData.realParameterData[i].attribute.start-data->localData[0]->realVars[i])/scalingCoefficient)*((data->modelData.realParameterData[i].attribute.start-data->localData[0]->realVars[i])/scalingCoefficient);
-        else
-          funcValue += (1.0-lambda)*(data->modelData.realParameterData[i].attribute.start-data->localData[0]->realVars[i])*(data->modelData.realParameterData[i].attribute.start-data->localData[0]->realVars[i]);
+        /*else
+          funcValue += (1.0-lambda)*(data->modelData.realParameterData[i].attribute.start-data->localData[0]->realVars[i])*(data->modelData.realParameterData[i].attribute.start-data->localData[0]->realVars[i]);*/
       }
   }