恢复框架代码

3 days ago · 76cc20ed14
parent 1d5c0bfdb6
commit 76cc20ed14
5 changed files with 13 additions and 2 deletions
--- a/Bin/Config/Lang/cn/MPA_cn.qm
+++ b/Bin/Config/Lang/cn/MPA_cn.qm
--- a/Bin/Config/Lang/cn/MPA_cn.ts
+++ b/Bin/Config/Lang/cn/MPA_cn.ts
@ -2129,6 +2129,12 @@
        <source>Normalized Gauss Newton</source>
        <translation>规则化高斯-牛顿</translation>
    </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>
        <location filename="../../../../Src/iGui/iSubWxs/iWxAutoFit.cpp" line="138"/>
        <source>Parameter</source>
--- a/Bin/Config/Lang/cn/WTAI_cn.ts
+++ b/Bin/Config/Lang/cn/WTAI_cn.ts
@ -4715,6 +4715,10 @@ MethodID:%1</source>
        <source>Normalized Gauss Newton</source>
        <translation>规则化高斯-牛顿</translation>
    </message>
+    <message>
+        <source>Genetic Algorithm</source>
+        <translation type="obsolete">遗传算法</translation>
+    </message>
    <message>
        <location filename="../../../../Src/mGui/mSubWxs/iWxAutoFit.cpp" line="272"/>
        <source>Parameter</source>
--- a/Bin/Config/Unit/UnitDefault.dat
+++ b/Bin/Config/Unit/UnitDefault.dat
--- a/Include/mAlg/mAlgDefines/mAlgDefines.h
+++ b/Include/mAlg/mAlgDefines/mAlgDefines.h
@ -292,7 +292,8 @@ enum Fit_Method
 {
 	FM_GaussNewton = 0, //高斯牛顿
    FM_GaussNewtonEx,   //归一化高斯牛顿
-    FM_ParticleSwarm = 3,   //粒子群算法(Particle Swarm Optimization)，保留原有枚举值
+    FM_Genetic,         //遗传算法
+    FM_ParticleSwarm,   //粒子群算法(Particle Swarm Optimization)
    FM_Unknown
 };