|
@@ -58,10 +58,10 @@ public class PidLambdaContainer {
|
|
|
@Value("${ad.model.pid.kd:0.2}")
|
|
|
Double kd = 0d;
|
|
|
|
|
|
- @Value("${ad.model.pid.v2.lambda.max:5.0}")
|
|
|
+ @Value("${ad.model.pid.lambda.max:5.0}")
|
|
|
Double maxLambda = 0d;
|
|
|
|
|
|
- @Value("${ad.model.pid.v2.lambda.min:0.8}")
|
|
|
+ @Value("${ad.model.pid.lambda.min:0.2}")
|
|
|
Double minLambda = 0d;
|
|
|
OSS client;
|
|
|
|
|
@@ -127,8 +127,8 @@ public class PidLambdaContainer {
|
|
|
}
|
|
|
latestRealCPA=realCost/conversion;
|
|
|
Double lambdaNew =cacheItem.calculate(kp,ki,kd,cpa,latestRealCPA);
|
|
|
- if(lambdaNew<0.5){
|
|
|
- lambdaNew=0.5;
|
|
|
+ if(lambdaNew<minLambda){
|
|
|
+ lambdaNew=minLambda;
|
|
|
}
|
|
|
cacheItem.lambda=lambdaNew;
|
|
|
cacheItem.latestRealCpa=latestRealCPA;
|
|
@@ -228,7 +228,6 @@ public class PidLambdaContainer {
|
|
|
return kp * error + ki * integral + kd * derivative;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
public void reset() {
|
|
|
integral = 0;
|
|
|
lastError = 0;
|