开会修改部分内容

SimulationServer/Component/SJAllTotalTaskPerformance.cs

@@ -23,14 +23,16 @@ public class SJAllTotalTaskPerformanceComponent
         double 总飞行时间 = 0;
         double 人员存活率 = 0;
         double 任务是否成功 = 0;
-        float 识别成功率 = missions.FindAll(a => a.Success).Count / missions.Count;
-        SJAllTotalTaskPerformance.识别成功率 = (识别成功率 * 100).ToString();
+        float 识别成功率 = 0f;
+
 
         double aircreftCount = 0;
         foreach (SeaSJRescueMission mhRescueMission in missions)
         {
             foreach (var aircraft in mhRescueMission.aircrafts)
             {
+                if (aircraft.isseePerson)
+                    识别成功率 += 1f;
                 if (任务准备时间 < aircraft.TaskReadyTime)
                     任务准备时间 = aircraft.TaskReadyTime;
                 平均搜索时间 += aircraft.SearchTime;
@@ -41,6 +43,7 @@ public class SJAllTotalTaskPerformanceComponent
         }
         if (人员存活率 != 0)
             任务是否成功 = 1;
+        SJAllTotalTaskPerformance.识别成功率 = (识别成功率 / aircreftCount).ToString();
         SJAllTotalTaskPerformance.任务准备时间 = 任务准备时间.ToString();
         SJAllTotalTaskPerformance.平均搜索时间 = (平均搜索时间 / aircreftCount).ToString();
         SJAllTotalTaskPerformance.平均救助时间 = 5.ToString();

SimulationServer/Entity/AircraftSJ.cs

@@ -19,24 +19,24 @@ public class AircraftSJ : AircraftEntity
     private double temptime = 0;
     private double probability = 0;
     private double finalProbability = 1.0;
-    private bool isseefire = false;
+    public bool isseePerson = false;
     private int fireIndex = -1; // 记录发现火点的位置
     public EquationHelper helper;
     public SeaSouJiuTask taskContent;
     public bool Success = true; //本目标搜救是否成功
-
+    public GetNCData getNCData;
     public override void Reset()
     {
         base.Reset();
         IsOver = false;
-        isseefire = false;
-        Success = true;        
+        isseePerson = false;
+        Success = true;
     }
 
     public override void Start()
     {
-        Velocitys = new double[5] {220, 220, 60, 110, 0}; // 速度
-        
+        Velocitys = new double[5] { 220, 220, 60, 110, 0 }; // 速度
+
         //TODO 计算 AirRoute[]
         double[] initialPosition =
         {
@@ -84,19 +84,19 @@ public class AircraftSJ : AircraftEntity
             // 求 points 的中心点
             var startPoint1 = new Point
             {
-                lat = points[0].lat/2 + points[1].lat/2,
-                lon = points[0].lon/2 + points[1].lon/2
+                lat = points[0].lat / 2 + points[1].lat / 2,
+                lon = points[0].lon / 2 + points[1].lon / 2
             };
             var startPoint2 = new Point
             {
-                lat = points[2].lat/2 + points[3].lat/2,
-                lon = points[2].lon/2 + points[3].lon/2
+                lat = points[2].lat / 2 + points[3].lat / 2,
+                lon = points[2].lon / 2 + points[3].lon / 2
             };
-            
+
             var centerPoint = new Point
             {
-                lat = startPoint1.lat/2 + startPoint2.lat/2,
-                lon = startPoint1.lon/2 + startPoint2.lon/2
+                lat = startPoint1.lat / 2 + startPoint2.lat / 2,
+                lon = startPoint1.lon / 2 + startPoint2.lon / 2
             };
             waypoints = SectorSearch.sectorSearch(centerPoint, 30, taskContent.SearchWidth);
         }
@@ -106,31 +106,31 @@ public class AircraftSJ : AircraftEntity
             // 求 points 的中心点
             var startPoint1 = new Point
             {
-                lat = points[0].lat/2 + points[1].lat/2,
-                lon = points[0].lon/2 + points[1].lon/2
+                lat = points[0].lat / 2 + points[1].lat / 2,
+                lon = points[0].lon / 2 + points[1].lon / 2
             };
             var startPoint2 = new Point
             {
-                lat = points[2].lat/2 + points[3].lat/2,
-                lon = points[2].lon/2 + points[3].lon/2
+                lat = points[2].lat / 2 + points[3].lat / 2,
+                lon = points[2].lon / 2 + points[3].lon / 2
             };
-            
+
             var centerPoint = new Point
             {
-                lat = startPoint1.lat/2 + startPoint2.lat/2,
-                lon = startPoint1.lon/2 + startPoint2.lon/2
+                lat = startPoint1.lat / 2 + startPoint2.lat / 2,
+                lon = startPoint1.lon / 2 + startPoint2.lon / 2
             };
             // 以 centerPoint 为中心，生成正方形区域
             var lonD = Math.Abs(points[0].lon - points[1].lon);
             var latD1 = Math.Abs(points[1].lat - points[2].lat);
             var max = Math.Max(lonD, latD1);
-            
+
             // 以 distance 为边长 以 centerPoint 为中心点的正方形
-            // 初始正方形的边长 为 矩形搜索区域短边的 1/5
-            var temp0 = new Point(centerPoint.lat + max/2, centerPoint.lon - max/2);
-            var temp1 = new Point(centerPoint.lat + max/2, centerPoint.lon + max/2);
-            var temp2 = new Point(centerPoint.lat - max/2, centerPoint.lon + max/2);
-            var temp3 = new Point(centerPoint.lat - max/2, centerPoint.lon - max/2);
+
+            var temp0 = new Point(centerPoint.lat + max / 2, centerPoint.lon - max / 2);
+            var temp1 = new Point(centerPoint.lat + max / 2, centerPoint.lon + max / 2);
+            var temp2 = new Point(centerPoint.lat - max / 2, centerPoint.lon + max / 2);
+            var temp3 = new Point(centerPoint.lat - max / 2, centerPoint.lon - max / 2);
             waypoints = TZFX.GenerateWaypoints(temp0, temp1, temp2, temp3, max, taskContent.SearchWidth);
         }
         // List<Point> 转成 List<AirRoute>
@@ -143,13 +143,13 @@ public class AircraftSJ : AircraftEntity
                 AirRouteLongitude = item.lon
             });
         }
-        
+
         FlightPlanEditor.airroute = airRoutes.ToArray();
 
         MissionPoint missionPoint = new MissionPoint();
         missionPoint.MissionPointLatitude = waypoints[0].lat;
         missionPoint.MissionPointLongitude = waypoints[0].lon;
-        
+
         FlightPlanEditor.missionpoint = missionPoint;
 
         FXJHGenerate.FromStartToMission(FlightPlanEditor, ref TurningPoints); //生成从起点到任务段起点的航路点
@@ -158,9 +158,11 @@ public class AircraftSJ : AircraftEntity
 
         FXJHGenerate.FXJHTPDiedai(FlightPlanEditor, ref TurningPoints, Velocitys, FuelConsumptions);
 
+        getNCData = new GetNCData();
+        getNCData.GetData();
         Task.Run(() =>
         {
-            bool isseefire = false;
+            bool isseePerson = false;
             double temptime = 0; // 自增时间，每次增加1s
             CurrentLocation currentLocation = new CurrentLocation();
             double probability = 0;
@@ -185,11 +187,11 @@ public class AircraftSJ : AircraftEntity
 
 
                 var windSpeed = Math.Sqrt(wind[0] * wind[0] + wind[1] * wind[1]);
-                
+
                 var waveHigh = SeaSJ.GetWaveHeightFromAPI(nCread, currentLocation.CurrentLon,
                     currentLocation.CurrentLat, temptime);
 
-                var distance = Utils.Util.GetDistance(currentLocation.CurrentLon,targetPoint.x, currentLocation.CurrentLat,
+                var distance = Utils.Util.GetDistance(currentLocation.CurrentLon, targetPoint.x, currentLocation.CurrentLat,
                     targetPoint.y);
                 Log.Info("距离：====================" + distance);
                 if (distance < 20)
@@ -201,24 +203,28 @@ public class AircraftSJ : AircraftEntity
                 finalProbability *= (1 - probability);
 
                 Console.WriteLine(
-                    $"海上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseefire}");
+                    $"海上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}");
 
                 double randomValue = random.NextDouble(); // 生成随机数比较概率
                 if (randomValue < (1 - finalProbability))
                 {
-                    isseefire = true;
+                    isseePerson = true;
+                    this.isseePerson = true;
                     fireIndex = currentLocation.Currentsegnum; // 记录当前航路点位置
                     IsOver = true;
                 }
                 else
                 {
-                    isseefire = false;
+                    isseePerson = false;
                 }
 
                 temptime += 10;
-            } while (!isseefire && IsOver == false);
+            } while (!isseePerson && IsOver == false);
+            //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}，是否看到落水人员：{isseefire}");
+                $"海上任务1：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到落水人员：{isseePerson}，人员是否幸存：{Success}");
+
             finalProbability = 1 - finalProbability;
 
             if (fireIndex != -1)
@@ -266,19 +272,19 @@ public class AircraftSJ : AircraftEntity
 
         TotalFuelConsumption = TurningPoints[0].RemainingFuel -
                                TurningPoints[TurningPoints.Count - 1].RemainingFuel;
-        
-        
-        
-        GetNCData getNCData = new GetNCData();
-        getNCData.GetData();
-        
+
+
+
+        //GetNCData getNCData = new GetNCData();
+        ////getNCData.GetData();
+
         double time = TotalTime; //time——搜索时间，单位：秒；数据测试用
-        
+
         double latitude = FlightPlanEditor.targetpoint[0].TargetPointLatitude; //落水人员纬度；数据测试用
         double longitude = FlightPlanEditor.targetpoint[0].TargetPointLongitude; //落水人员经度，数据测试用
-        
+
         double survivalTime = SurvivalTimeModel.SurvivalTime(getNCData.tempreadNC, latitude, longitude, time); //幸存时间
-        
+
         if (survivalTime * 3600 > time)
         {
             Success = true;

SimulationServer/Entity/SeaSJRescueMission.cs

@@ -103,6 +103,20 @@ public class SeaSJRescueMission : Entity
                 }
             }
         }
+        if (currentExecuteCount == -10)
+        {
+            foreach (var kv in singleReport)
+            {
+                foreach (var kv2 in kv.Value)
+                {
+                    var sum = 0;
+                    foreach (var item in kv2.Value)
+                    {
+
+                    }
+                }
+            }
+        }
     }
     
     public void SaveTotalMH()

SimulationServer/bin/Debug/net7.0/Missions/task_config.json

@@ -20,7 +20,7 @@
             },
             "目标点ID": 1,
             "搜索任务载荷": "目视搜索",
-            "搜索方式": "平行线搜索",
+            "搜索方式": "扩展矩形搜索",
             "搜索扫视宽度": 0.02,
             "下一个任务ID": ""
         },