略过算法完成海上搜救和陆上搜寻的输出excel功能测试

SimulationServer/Component/SJAllTotalTaskPerformance.cs

@@ -147,7 +147,7 @@ public class SJAllTotalTaskPerformanceComponent
             { "平均搜索时间", LSJAllTotalTaskPerformance.平均搜索时间.ToString() },
             { "平均救助时间", LSJAllTotalTaskPerformance.平均救助时间.ToString() },
             { "总飞行时间", LSJAllTotalTaskPerformance.总飞行时间.ToString() },
-            { "环境覆盖率", LSJAllTotalTaskPerformance.海情覆盖率.ToString() },
+            { "环境覆盖率", LSJAllTotalTaskPerformance.环境覆盖率.ToString() },
             { "任务是否成功", LSJAllTotalTaskPerformance.任务是否成功.ToString() },
             { "人员存活率", LSJAllTotalTaskPerformance.人员存活率.ToString() }
         };

SimulationServer/Component/TaskComponent.cs

@@ -187,38 +187,41 @@ public class TaskComponentUpdateSystem : UpdateSystem<TaskComponent>
 {
     public override void Update(TaskComponent self)
     {
-        if (self.SeaSJRescueMissions.Count <= 0) return;
-
-        if (self.SeaSJRescueMissions.All(m => m.IsOver))
+        if (self.SeaSJRescueMissions.Count > 0)
         {
-            for (int i = 0; i < self.ExecutionContext; i++)
+            if (self.SeaSJRescueMissions.All(m => m.IsOver))
             {
-                self.SSJAllTotalTaskPerformance.FillData(self.SeaSJRescueMissions);
-                var report = self.SSJAllTotalTaskPerformance.GetReport();
-                if (report["总任务表现"]["任务是否成功"] == "1")
-                    self.seaSuccessCount++;
-                self.SaveSeaSJ(report);
+                for (int i = 0; i < self.ExecutionContext; i++)
+                {
+                    self.SSJAllTotalTaskPerformance.FillData(self.SeaSJRescueMissions);
+                    var report = self.SSJAllTotalTaskPerformance.GetReport();
+                    if (report["总任务表现"]["任务是否成功"] == "1")
+                        self.seaSuccessCount++;
+                    self.SaveSeaSJ(report);
+                }
+                self.SaveTotalMHSea();
+                self.ReportAllSJSea();
+                self.SeaSJRescueMissions.Clear();
             }
-            self.SaveTotalMHSea();
-            self.ReportAllSJSea();
-            self.SeaSJRescueMissions.Clear();
-        }
 
-        if (self.LandSJRescueMissions.Count <= 0) return;
+        }
 
-        if (self.LandSJRescueMissions.All(m => m.IsOver))
+        if (self.LandSJRescueMissions.Count > 0)
         {
-            for (int i = 0; i < self.ExecutionContext; i++)
+            if (self.LandSJRescueMissions.All(m => m.IsOver))
             {
-                self.SSJAllTotalTaskPerformance.FillData1(self.LandSJRescueMissions);
-                var report = self.SSJAllTotalTaskPerformance.GetReport1();
-                if (report["总任务表现"]["任务是否成功"] == "1")
-                    self.landSuccessCount++;
-                self.SaveLandSJ(report);
+                for (int i = 0; i < self.ExecutionContext; i++)
+                {
+                    self.SSJAllTotalTaskPerformance.FillData1(self.LandSJRescueMissions);
+                    var report = self.SSJAllTotalTaskPerformance.GetReport1();
+                    if (report["总任务表现"]["任务是否成功"] == "1")
+                        self.landSuccessCount++;
+                    self.SaveLandSJ(report);
+                }
+                self.SaveTotalMHLand();
+                self.ReportAllSJLand();
+                self.LandSJRescueMissions.Clear();
             }
-            self.SaveTotalMHLand();
-            self.ReportAllSJLand();
-            self.LandSJRescueMissions.Clear();
         }
     }
 }

SimulationServer/Entity/AircraftLandSJ.cs

@@ -39,9 +39,7 @@ public class AircraftLandSJ : AircraftEntity
     {
         Velocitys = new double[5] { 220, 220, 60, 110, 0 }; // 速度
 
-        List<double[]> route = ContourSearch.ContourSearch1(SearchMissionMode.Poly, SearchMissionMode.interval,
-            SearchMissionMode.MinLength, SearchMissionMode.TrueH, SearchMissionMode.JG, ContourSearch.DemHelper());
-
+        List<double[]> route = ContourSearch.ContourSearch1(SearchMissionMode.Poly, SearchMissionMode.interval,SearchMissionMode.MinLength, SearchMissionMode.TrueH, SearchMissionMode.JG, ContourSearch.DemHelper());
 
         // route 转成 List<AirRoute>
         List<AirRoute> airRoutes = new List<AirRoute>();
@@ -57,7 +55,6 @@ public class AircraftLandSJ : AircraftEntity
 
         FlightPlanEditor.airroute = airRoutes.ToArray();
 
-
         FXJHGenerate.FromStartToMission(FlightPlanEditor, ref TurningPoints); //生成从起点到任务段起点的航路点
 
         // TODO 与王子涵确认这个方法
@@ -76,7 +73,7 @@ public class AircraftLandSJ : AircraftEntity
             double finalProbability = 1.0;
             Random random = new Random();
             int fireIndex = -1; // 记录发现火点的位置
-
+            //IsOver = true;
             do
             {
                 (currentLocation, _) =
@@ -94,32 +91,18 @@ public class AircraftLandSJ : AircraftEntity
                     targetPoint.y);
                 Log.Info("距离：====================" + distance);
 
-                //====================================================
-                Text_readNC text_ReadNC = new Text_readNC();
-                text_ReadNC.GetNCData();
-                text_ReadNC.GetWaveHighData();
-                var nCread = text_ReadNC.windNCread;
-                var wind = SeaSJ.GetWindVelocityFromAPI(nCread, currentLocation.CurrentLat, currentLocation.CurrentLon,temptime);
-
-
-                var windSpeed = Math.Sqrt(wind[0] * wind[0] + wind[1] * wind[1]);
-
-                var waveHigh = SeaSJ.GetWaveHeightFromAPI(nCread, currentLocation.CurrentLon,
-                    currentLocation.CurrentLat, temptime);
-
-                //====================================================
                 if (distance < 20)
                 {
                     //TODO 和学生对接确认， 发现概率算法
                     probability = helper.getProbability(aricraftPoint, targetPoint, currentLocation.CurrentCourse,
-                        windSpeed, waveHigh, "落水人员", "海上"); // 计算发现概率，需要其他模型输入 // 计算发现概率，需要其他模型输入
+                        10, 10, "遇险人员", "陆地"); // 计算发现概率，需要其他模型输入 // 计算发现概率，需要其他模型输入
                 }
 
 
                 //finalProbability *= (1 - probability); 
 
                 Console.WriteLine(
-                    $"海上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}");
+                    $"陆上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到遇险人员：{isseePerson}");
 
                 double randomValue = random.NextDouble(); // 生成随机数比较概率
                 if (randomValue < probability) // 1 - finalProbability
@@ -140,7 +123,7 @@ public class AircraftLandSJ : AircraftEntity
             //Console.WriteLine(
             //    $"海上任务1：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}");
             Console.WriteLine(
-                $"海上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}");
+                $"陆上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到遇险人员：{isseePerson}");
 
             //finalProbability = 1 - finalProbability; 
 

SimulationServer/Entity/AircraftSJ.cs

@@ -204,13 +204,13 @@ public class AircraftSJ : AircraftEntity
                         windSpeed, waveHigh, "落水人员", "海上"); // 计算发现概率，需要其他模型输入 // 计算发现概率，需要其他模型输入
                 }
 
-                finalProbability *= (1 - probability); //
+                //finalProbability *= (1 - probability);
 
                 Console.WriteLine(
                     $"海上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}");
 
                 double randomValue = random.NextDouble(); // 生成随机数比较概率
-                if (randomValue < (1 - finalProbability))  // probability
+                if (randomValue < probability)  //  1 - finalProbability
                 {
                     isseePerson = true;
                     this.isseePerson = true;
@@ -229,7 +229,7 @@ public class AircraftSJ : AircraftEntity
             Console.WriteLine(
                 $"海上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}，人员是否幸存：{Success}");
 
-            finalProbability = 1 - finalProbability; //
+            //finalProbability = 1 - finalProbability;
 
             if (fireIndex != -1)
             {

SimulationServer/EventHandler/ServerStartEventHandler.cs

@@ -97,17 +97,17 @@ public class ServerStartEventHandler : AEvent<ServerStart>
         }
         //Console.WriteLine("taskConfig.seaSouJiuTasks.Count:" + taskConfig.seaSouJiuTasks.Count);
         //创建搜救
-        //foreach (var seaSJTask in taskConfig.seaSouJiuTasks)
-        //{
-        //    //Console.WriteLine("seaSJTask.missionInformation.MissionName:" + seaSJTask.missionInformation.MissionName);
-        //    //Console.WriteLine("TargetPointId:" + seaSJTask.TargetPointId);
-        //    //Console.WriteLine("SearchPayload:" + seaSJTask.SearchPayload);
-        //    //Console.WriteLine("SearchMode:" + seaSJTask.SearchMode);
-        //    //Console.WriteLine("RadarTransmitterPower:" + seaSJTask.RadarTransmitterPower);
-        //    //Console.WriteLine("仿真次数:" + editorConfig.runCounts);
-        //    Game.EventSystem.Publish(new CreateSeaSJTask
-        //    { EditorConfig = editorConfig, SeaSJTask = seaSJTask });
-        //}
+        foreach (var seaSJTask in taskConfig.seaSouJiuTasks)
+        {
+            //Console.WriteLine("seaSJTask.missionInformation.MissionName:" + seaSJTask.missionInformation.MissionName);
+            //Console.WriteLine("TargetPointId:" + seaSJTask.TargetPointId);
+            //Console.WriteLine("SearchPayload:" + seaSJTask.SearchPayload);
+            //Console.WriteLine("SearchMode:" + seaSJTask.SearchMode);
+            //Console.WriteLine("RadarTransmitterPower:" + seaSJTask.RadarTransmitterPower);
+            //Console.WriteLine("仿真次数:" + editorConfig.runCounts);
+            Game.EventSystem.Publish(new CreateSeaSJTask
+            { EditorConfig = editorConfig, SeaSJTask = seaSJTask });
+        }
 
         foreach (var landSXTask in taskConfig.LandSouXunTasks)
         {