ソースを参照

update:更新几何分析算法

mux 2 ヶ月 前
コミット
f4d71daa81

+ 2 - 1
DPTools/components/DataAnalysis/AnalysisAlgorithmcs.cs

@@ -3,11 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 //using JHFX = Package_turnout_analysis_geo; //几何分析 道岔分析
 //using JHTQ = Package_turnout_identify_geo; //几何分析 道岔提取
 using LGL = Package_turnout_analysis_wrf;//轮轨力 分析
 //using LGLTQ = Package_turnout_identify_wrf;//轮轨力 提取
-using JH = Package_turnout_analysis;
+using JH = Package_turnout_analysis; //sub_main_turnout_analysis_geo
 using MathWorks.MATLAB.NET.Arrays;
 using JHWX = Package_geo_change_analysis_for_turnout;//微小算法
 using System.Windows.Forms;

+ 2 - 2
ZDHscript/AnalysisAlgorithmcs.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 //using JHTQ = Package_turnout_identify_geo; //几何分析 道岔提取
 using LGL = Package_turnout_analysis_wrf;//轮轨力 分析
 //using LGLTQ = Package_turnout_identify_wrf;//轮轨力 提取
-using JH = Package_turnout_analysis;
+using JH = sub_main_turnout_analysis_geo;
 using MathWorks.MATLAB.NET.Arrays;
 using JHWX = Package_geo_change_analysis_for_turnout;//微小算法
 
@@ -41,7 +41,7 @@ namespace ZDHscript
             MWArray[] agrsIn = new MWArray[] { fname_dir0, fname0, linename, tz_curv_switch, tz_turnout_switch, mile_min, mile_max, mile_id, carname, distance_table_switch };
             MWArray[] agrsOut = new MWArray[12];
 
-            jhfx.sub_main_turnout_analysis(12, ref agrsOut, agrsIn);
+            jhfx.sub_main_turnout_analysis_geo(12, ref agrsOut, agrsIn);
 
             return agrsOut;
         }