Skip to content

Commit 2d0b434

Browse files
#33 and #34 completed the globalFbe implementation and the test files
1 parent 443579b commit 2d0b434

6 files changed

Lines changed: 4632 additions & 3506 deletions

File tree

src/SmpcController.cu

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,7 @@ real_t SmpcController::computeLineSearchLbfgsUpdate(real_t valueFbeYvar){
11111111

11121112
valueFbeWvar = computeValueFbe();
11131113

1114+
//cout << "iStep " << iStep << " " << tau << " " << valueFbeWvar - valueFbeYvar << endl;
11141115
if( valueFbeWvar <= valueFbeYvar){
11151116
iStep = iStep + 1;
11161117
if (iStep < maxLineSearchStep){
@@ -1125,7 +1126,7 @@ real_t SmpcController::computeLineSearchLbfgsUpdate(real_t valueFbeYvar){
11251126
}
11261127
}
11271128

1128-
return -tau;
1129+
return abs(tau);
11291130
}
11301131

11311132
/**

src/test/testDataFiles/controllerConfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
5.224101e+00,
5252
7.998018e+01],
5353
"prevUhat" : [2.519617e+00, 7.558852e+00, -2.519617e+00, 0, -1.007847e+01, -2.519617e+00],
54-
"prevV" : [8.740273e+02, 1.592648e+03, 2.476066e+03, 1.293222e+03],
55-
"prevU" : [1.992750e+03, 1.488926e+03, 4.231456e+01, 1.592648e+03, 1.471289e+03, 4.615088e+02],
54+
"prevV" : [1.443178e+03, 3.581965e+03, 9.395928e+02, 2.395169e+03],
55+
"prevU" : [2.426339e+03, 3.934708e+02, 5.404388e+02, 3.581965e+03, 3.758335e+02, 1.492429e+03],
5656
"stepSize" : [1.000000e-04],
5757
"maxIterations" : [500],
5858
"penaltyStateX" : [1000000],

0 commit comments

Comments
 (0)