clarify vars in test

This commit is contained in:
Jonathan Shook
2020-04-23 12:41:10 -05:00
parent 9ad2f46ff4
commit d0871cfb55
3 changed files with 10 additions and 8 deletions

View File

@@ -15,7 +15,7 @@
* /
*/
cycle_rate_change = {
activitydef = {
"alias" : "cycle_rate_change",
"type" : "diag",
"cycles" : "0..1000000",
@@ -26,7 +26,7 @@ cycle_rate_change = {
};
print('starting cycle_rate_change');
scenario.start(cycle_rate_change);
scenario.start(activitydef);
print('started');
print('cyclerate at 0ms:' + activities.cycle_rate_change.cyclerate);
scenario.waitMillis(1000);
@@ -48,6 +48,7 @@ for(i=0;i<20;i++) {
break;
}
}
scenario.stop(activitydef);
print('cycle_rate_change activity finished');

View File

@@ -6,12 +6,12 @@ optimo.param('pb', 0.0, 200000.0);
optimo.setInitialRadius(10000.0).setStoppingRadius(0.001).setMaxEval(1000);
optimo.setObjectiveFunction(
function (ary) {
function (values) {
// var arraydata = Java.from(ary);
// print("arraydata:" + JSON.stringify(arraydata));
print("ary:" + JSON.stringify(values));
var a = 0.0 + ary.pa;
var b = 0.0 + ary.pb;
var a = 0.0 + values.pa;
var b = 0.0 + values.pb;
var result = 1000000 - ((Math.abs(100 - a) + Math.abs(100 - b)));
print("a=" + a + ",b=" + b + ", r=" + result);

View File

@@ -15,7 +15,7 @@
* /
*/
cycle_rate = {
activitydef = {
"alias" : "cycle_rate",
"type" : "diag",
"cycles" : "0..300000",
@@ -25,7 +25,7 @@ cycle_rate = {
};
print('starting cycle_rate');
scenario.start(cycle_rate);
scenario.start(activitydef);
print('started');
print('cyclerate at 0ms:' + activities.cycle_rate.cyclerate);
scenario.waitMillis(1000);
@@ -45,6 +45,7 @@ for(i=0;i<10;i++) {
break;
}
}
scenario.stop(activitydef);
print('cycle_rate activity finished');