|
|
@@ -42,7 +42,7 @@
|
|
|
<optimizers>
|
|
|
<optimizer>
|
|
|
<#if vo.evolution??>
|
|
|
- <name>${vo.evolution.algorithm?lower_case}</name>
|
|
|
+ <name>${vo.evolution.algorithm}</name>
|
|
|
<configFile/>
|
|
|
<configuration>
|
|
|
<maxgen>${vo.evolution.epoch}</maxgen>
|
|
|
@@ -53,37 +53,32 @@
|
|
|
<#else>
|
|
|
</#if>
|
|
|
<#if vo.surro??>
|
|
|
- <name>${vo.surro.algorithm?lower_case}</name>
|
|
|
+ <name>${vo.surro.algorithm}</name>
|
|
|
<configuration>
|
|
|
- <iout>${vo.surro.iout}</iout>
|
|
|
- <irestart>${vo.surro.irestart}</irestart>
|
|
|
- <ndoe>${vo.surro.ndoe}</ndoe>
|
|
|
- <ns>${vo.surro.ns}</ns>
|
|
|
- <nsmax>${vo.surro.nsmax}</nsmax>
|
|
|
- <ns_lf>${vo.surro.nsLf}</ns_lf>
|
|
|
- <nsmax_lf>${vo.surro.nsmaxLf}</nsmax_lf>
|
|
|
- <ns_mk>[${vo.surro.nsMk}]</ns_mk>
|
|
|
- <nsmax_mk>[${vo.surro.nsmaxMk}]</nsmax_mk>
|
|
|
- <x_tol>${vo.surro.xTol}</x_tol>
|
|
|
- <feasibility_tol_real>${vo.surro.feasibilityTolReal}</feasibility_tol_real>
|
|
|
- <feasibility_tol_surro>${vo.surro.feasibilityTolSurro}</feasibility_tol_surro>
|
|
|
- <nsurro>${vo.surro.nsurro}</nsurro>
|
|
|
- <n_kriging>${vo.surro.nKriging}</n_kriging>
|
|
|
- <corr>${vo.surro.corr}</corr>
|
|
|
- <const_theta>${vo.surro.constTheta}</const_theta>
|
|
|
- <porder>${vo.surro.porder}</porder>
|
|
|
- <dcmp>${vo.surro.dcmp}</dcmp>
|
|
|
- <paraopt>${vo.surro.paraopt}</paraopt>
|
|
|
- <regular>${vo.surro.regular}</regular>
|
|
|
- <infill>${vo.surro.infill}</infill>
|
|
|
- <nparallel>${vo.surro.nparallel}</nparallel>
|
|
|
- <iopt>${vo.surro.iopt}</iopt>
|
|
|
- <icstr>${vo.surro.icstr}</icstr>
|
|
|
- <ipopsize>${vo.surro.ipopsize}</ipopsize>
|
|
|
- <maxgen>${vo.surro.maxgen}</maxgen>
|
|
|
- <pc>${vo.surro.pc}</pc>
|
|
|
- <pm>${vo.surro.pm}</pm>
|
|
|
- <myid_number>1</myid_number>
|
|
|
+ <irestart>${vo.surro.irestart}</irestart>
|
|
|
+ <ndoe>${vo.surro.ndoe}</ndoe>
|
|
|
+ <ns>${vo.surro.ns}</ns>
|
|
|
+ <nsmax>${vo.surro.nsmax}</nsmax>
|
|
|
+ <x_tol>${vo.surro.xTol}</x_tol>
|
|
|
+ <feasibility_tol_real>${vo.surro.feasibilityTolReal}</feasibility_tol_real>
|
|
|
+ <feasibility_tol_surro>${vo.surro.feasibilityTolSurro}</feasibility_tol_surro>
|
|
|
+ <nsurro>${vo.surro.nsurro}</nsurro>
|
|
|
+ <n_kriging>${vo.surro.nKriging}</n_kriging>
|
|
|
+ <corr>${vo.surro.corr}</corr>
|
|
|
+ <const_theta>${vo.surro.constTheta}</const_theta>
|
|
|
+ <porder>${vo.surro.porder}</porder>
|
|
|
+ <dcmp>${vo.surro.dcmp}</dcmp>
|
|
|
+ <paraopt>${vo.surro.paraopt}</paraopt>
|
|
|
+ <regular>${vo.surro.regular}</regular>
|
|
|
+ <infill>${vo.surro.infill}</infill>
|
|
|
+ <nparallel>${vo.surro.nparallel}</nparallel>
|
|
|
+ <iopt>${vo.surro.iopt}</iopt>
|
|
|
+ <icstr>${vo.surro.icstr}</icstr>
|
|
|
+ <ipopsize>${vo.surro.ipopsize}</ipopsize>
|
|
|
+ <maxgen>${vo.surro.maxgen}</maxgen>
|
|
|
+ <pc>${vo.surro.pc}</pc>
|
|
|
+ <pm>${vo.surro.pm}</pm>
|
|
|
+ <myid_number>1</myid_number>
|
|
|
</configuration>
|
|
|
<#else>
|
|
|
</#if>
|
