Commit 3a8927c4 authored by Christophe Geuzaine's avatar Christophe Geuzaine

lists for constraints and constraintsSensitivity

parent 866462da
Pipeline #1071 passed with stage
in 10 minutes and 31 seconds
......@@ -1160,8 +1160,8 @@ struct Operation {
} OptimizerInitialize;
struct {
char *currentPoint; // input and ouput
char *objective, *constraints; // input
char *objectiveSensitivity, *constraintsSensitivity; // input
char *objective, *objectiveSensitivity; // input
List_T *constraints, *constraintsSensitivity; // input
char *residual;
} OptimizerUpdate;
} Case;
......
This diff is collapsed.
......@@ -5843,8 +5843,10 @@ OperationTerm :
Operation_P->Case.OptimizerInitialize.currentPointUpperBounds = $7;
}
| tOptimizerUpdate '[' CharExpr ',' CharExpr ',' CharExpr ','
CharExpr ',' CharExpr ',' '$' String__Index ']' tEND
| tOptimizerUpdate '[' CharExpr ','
CharExpr ',' BracedRecursiveListOfCharExpr ','
CharExpr ',' BracedRecursiveListOfCharExpr ','
'$' String__Index ']' tEND
{
Operation_P = (struct Operation*)
List_Pointer(Operation_L, List_Nbr(Operation_L)-1) ;
......
......@@ -74,12 +74,17 @@ void Operation_OptimizerUpdate(struct Operation *Operation_P)
{
printf("Opti update:\n");
debugInput("currentPoint", Operation_P->Case.OptimizerUpdate.currentPoint);
debugInput("current point", Operation_P->Case.OptimizerUpdate.currentPoint);
debugInput("objective", Operation_P->Case.OptimizerUpdate.objective);
debugInput("constraints", Operation_P->Case.OptimizerUpdate.constraints);
debugInput("objectiveSensitivity", Operation_P->Case.OptimizerUpdate.objectiveSensitivity);
debugInput("constraintsSensitivity", Operation_P->Case.OptimizerUpdate.constraintsSensitivity);
for(int i = 0; i < List_Nbr(Operation_P->Case.OptimizerUpdate.constraints); i++){
char *c; List_Read(Operation_P->Case.OptimizerUpdate.constraints, i, &c);
debugInput("constraint", c);
}
debugInput("objective sensitivity", Operation_P->Case.OptimizerUpdate.objectiveSensitivity);
for(int i = 0; i < List_Nbr(Operation_P->Case.OptimizerUpdate.constraintsSensitivity); i++){
char *c; List_Read(Operation_P->Case.OptimizerUpdate.constraintsSensitivity, i, &c);
debugInput("constraint sensitivity", c);
}
Value v;
v.Type = SCALAR;
v.Val[0] = 1e-12;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment