恢复框架代码

feature/PebiSolver-Integration-20260818
lvjunjie 3 days ago
parent 1d5c0bfdb6
commit 76cc20ed14

Binary file not shown.

@ -2129,6 +2129,12 @@
<source>Normalized Gauss Newton</source> <source>Normalized Gauss Newton</source>
<translation>-</translation> <translation>-</translation>
</message> </message>
<message>
<location filename="../../../../Src/iGui/iSubWxs/iWxAutoFit.cpp" line="71"/>
<location filename="../../../../Src/iGui/iSubWxs/iWxAutoFit.cpp" line="311"/>
<source>Genetic Algorithm</source>
<translation></translation>
</message>
<message> <message>
<location filename="../../../../Src/iGui/iSubWxs/iWxAutoFit.cpp" line="138"/> <location filename="../../../../Src/iGui/iSubWxs/iWxAutoFit.cpp" line="138"/>
<source>Parameter</source> <source>Parameter</source>

@ -4715,6 +4715,10 @@ MethodID:%1</source>
<source>Normalized Gauss Newton</source> <source>Normalized Gauss Newton</source>
<translation>-</translation> <translation>-</translation>
</message> </message>
<message>
<source>Genetic Algorithm</source>
<translation type="obsolete"></translation>
</message>
<message> <message>
<location filename="../../../../Src/mGui/mSubWxs/iWxAutoFit.cpp" line="272"/> <location filename="../../../../Src/mGui/mSubWxs/iWxAutoFit.cpp" line="272"/>
<source>Parameter</source> <source>Parameter</source>

File diff suppressed because one or more lines are too long

@ -292,7 +292,8 @@ enum Fit_Method
{ {
FM_GaussNewton = 0, //高斯牛顿 FM_GaussNewton = 0, //高斯牛顿
FM_GaussNewtonEx, //归一化高斯牛顿 FM_GaussNewtonEx, //归一化高斯牛顿
FM_ParticleSwarm = 3, //粒子群算法(Particle Swarm Optimization),保留原有枚举值 FM_Genetic, //遗传算法
FM_ParticleSwarm, //粒子群算法(Particle Swarm Optimization)
FM_Unknown FM_Unknown
}; };

Loading…
Cancel
Save