修改任务配置文件及相关代码

KYFramework/KYFramework.csproj

@@ -8,6 +8,8 @@
 
 
   <ItemGroup>
+    <PackageReference Include="GeoCoordinate" Version="2.0.1" />
+    <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
     <PackageReference Include="MongoDB.Bson" Version="2.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.1.3" />

KYNetwork/KYNetwork.csproj

@@ -19,6 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="GeoCoordinate" Version="2.0.1" />
+    <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
     <PackageReference Include="UniTask" Version="2.5.0" />
   </ItemGroup>
 

Models/SimulationCommon/EditorConfig.cs

@@ -35,12 +35,12 @@ public struct AircraftParameter
     //public double AircraftRunTime;
     [JsonProperty("任务载荷型号")]
     public TaskLoadType taskLoadType;
-    //[JsonProperty("最大起飞重量")]
-    //public double MaxTakeoffWeight;
-    //[JsonProperty("最大载油量")]
-    //public double MaxFuelCapacity;
-    //[JsonProperty("最大载客数量")]
-    //public double MaxPassengerNumber;
+    [JsonProperty("最大起飞重量")]
+    public double MaxTakeoffWeight;
+    [JsonProperty("最大载油量")]
+    public double MaxFuelCapacity;
+    [JsonProperty("最大载客数量")]
+    public double MaxPassengerNumber;
 }
 
 public class TaskLoadType
@@ -242,10 +242,10 @@ public class EditorConfig
     public List<Base> bases = new List<Base>();
     [JsonProperty("飞行器信息")]
     public List<AircraftParameter>aircraftParameters = new List<AircraftParameter>();
-    //[JsonProperty("火点")]
-    //public List<FirePoint> firePoints = new List<FirePoint>();
-    //[JsonProperty("天气信息")]
-    //public CityWeather cityWeather = new CityWeather();
+    [JsonProperty("火点")]
+    public List<FirePoint> firePoints = new List<FirePoint>();
+    [JsonProperty("天气信息")]
+    public CityWeather cityWeather = new CityWeather();
     [JsonProperty("搜救目标点初始坐标")]
     public List<TargetPoint> targetPoints = new List<TargetPoint>();
     [JsonProperty("救援需求信息")]

Models/SimulationCommon/SimulationCommon.csproj

@@ -7,6 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="GeoCoordinate" Version="2.0.1" />
+      <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <PackageReference Include="OpenCvSharp4" Version="4.10.0.20240616" />
       <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20240616" />

Models/SimulationCommon/TaskConfig.cs

@@ -18,6 +18,10 @@ public class MissionInformation
     public string NextTaskId;
     [JsonProperty("目标点ID")]
     public int TargetPointId;
+    [JsonProperty("目标点")]
+    public string TargetPoint;
+    [JsonProperty("物资人员点")]
+    public string GoodsPersonPoint;
     [JsonProperty("开始日期")]
     public string StartDate;
     [JsonProperty("开始时间")]
@@ -45,7 +49,13 @@ public class TaskEndConditions
     [JsonProperty("执行次数")]
     public double RunCount;
     [JsonProperty("投送总人数")]
-    public int person_number;
+    public int person_number_Delivery;
+    [JsonProperty("机降总人数")]
+    public int person_number_Descent;
+    [JsonProperty("救援人数")]
+    public int person_number_Rescue;
+    [JsonProperty("空投物资总重量")]
+    public double goodsWeight;
 }
 
 public class AircraftInfo
@@ -56,12 +66,58 @@ public class AircraftInfo
     public string AircraftId;
     [JsonProperty("加油基地")]
     public string RefuelingBase;
-    [JsonProperty("加油基地编号")]
-    public string RefuelingBaseId;
+    //[JsonProperty("加油基地编号")]
+    //public string RefuelingBaseId;
     [JsonProperty("任务结束返回点")]
     public string TaskEndReturnPoint;
 }
 
+public class TaskParameter
+{
+    [JsonProperty("应用飞机编号")]
+    public string AircraftId;
+    [JsonProperty("索滑降高度")]
+    public double H;
+    [JsonProperty("投送人数")]
+    public int person_number;
+    [JsonProperty("风速")]
+    public double windspeed;
+    [JsonProperty("能见度")]
+    public double vis;
+    [JsonProperty("索滑降速度")]
+    public double descendspeed;
+    [JsonProperty("索滑降点")]
+    public MissionPoint[] MissionPoints_SHJ;
+    [JsonProperty("单机总机降人数")]
+    public int LandingPersonnel;
+    [JsonProperty("机降点")]
+    public MissionPoint[] MissionPoints_JJJY;
+    [JsonProperty("单次救援人数")]
+    public int RescuePersonnel;
+    [JsonProperty("观察盘旋圈数")]
+    public int TurnsNumber;
+    [JsonProperty("开伞空投")]
+    public bool isParachute;
+    [JsonProperty("空投重量")]
+    public double airdropWeight;
+    [JsonProperty("空投迎风面积")]
+    public double airdropWindArea;
+    [JsonProperty("空投方式")]  // 悬停空投/带速空投"
+    public string airdropWay;
+    [JsonProperty("空投点")]
+    public MissionPoint[] MissionPoints_KTKS;
+    [JsonProperty("高度")]
+    public double Height;
+    [JsonProperty("吊运人数")]
+    public int liftPersonnel;
+    [JsonProperty("吊运上升速度")]
+    public double liftUpSpeed;
+    [JsonProperty("吊运下降速度")]
+    public double liftDownSpeed;
+    [JsonProperty("任务点")]
+    public MissionPoint[] MissionPoints_KZDY;
+}
+
 public class MissionPoint
 {
     [JsonProperty("任务点经度")]
@@ -119,14 +175,54 @@ public class ZCMethod
     public int SurroundNum;
 }
 
-public class SHJTask
+public class LandSouXunTask
+{
+    [JsonProperty("任务信息")]
+    public MissionInformation missionInformation;
+    [JsonProperty("应用航空器")]
+    public AircraftInfo[] aircraftInfos;
+    [JsonProperty("协同模式")]
+    public CollaborativeMode collaborativeMode;
+    [JsonProperty("运行约束")]
+    public RunConstraints RunConstraints;
+    //搜索任务载荷
+    [JsonProperty("搜索任务载荷")]
+    public SearchMissionPayload[] missionSearchPayloads;
+    //搜索方式
+    [JsonProperty("搜索方式")]
+    public SearchMissionMode[] SearchModes;
+    //[JsonProperty("下一个任务ID")]
+    //public string NextTaskId;
+}
+
+public class SeaSouJiuTask
+{
+    [JsonProperty("任务信息")]
+    public MissionInformation missionInformation;
+    [JsonProperty("应用航空器")]
+    public AircraftInfo[] aircraftInfos;
+    [JsonProperty("协同模式")]
+    public CollaborativeMode collaborativeMode;
+    [JsonProperty("运行约束")]
+    public RunConstraints RunConstraints;
+    //[JsonProperty("目标点ID")]
+    //public int TargetPointId;
+    [JsonProperty("搜索任务载荷")]
+    public SearchMissionPayload[] missionSearchPayloads;
+    [JsonProperty("搜索方式")]
+    public SearchMissionMode[] SearchModes;
+    //[JsonProperty("下一个任务ID")]
+    //public string NextTaskId;
+}
+
+public class SHJTask //索滑降救援任务
 {
     [JsonProperty("任务信息")]
     public MissionInformation missionInformation;
     [JsonProperty("应用航空器")]
     public AircraftInfo[] aircraftInfos;
-    [JsonProperty("索滑降参数")]
-    public SHJParameter[] SHJParameters;
+    [JsonProperty("任务参数")]
+    public TaskParameter[] SHJParameters;
     //[JsonProperty("索滑降高度")]
     //public double H;
     //[JsonProperty("投送人数")]
@@ -145,73 +241,61 @@ public class SHJTask
     //public string NextTaskId;
 }
 
-public class KTKSTask
+public class JJJYTask //机降救援任务
 {
     [JsonProperty("任务信息")]
     public MissionInformation missionInformation;
     [JsonProperty("应用航空器")]
     public AircraftInfo[] aircraftInfos;
-    [JsonProperty("索滑降参数")]
-    public SHJParameter[] SHJParameters;
-    [JsonProperty("空投点")]
-    public MissionPoint[] MissionPoints;
+    [JsonProperty("任务参数")]
+    public TaskParameter[] JJJYParameters;
+    //[JsonProperty("单机总机降人数")]
+    //public double LandingPersonnel;
+    //[JsonProperty("机降点")]
+    //public MissionPoint[] MissionPoints;
+    //[JsonProperty("下一个任务ID")]
+    //public string NextTaskId;
 }
 
-public class SHJParameter
+public class ZSJYTask //着水救援任务
 {
-    [JsonProperty("应用飞机编号")]
-    public string AircraftId;
-    [JsonProperty("索滑降高度")]
-    public double H;
-    [JsonProperty("投送人数")]
-    public int person_number;
-    [JsonProperty("风速")]
-    public double windspeed;
-    [JsonProperty("能见度")]
-    public double vis;
-    [JsonProperty("索滑降速度")]
-    public double descendspeed;
-    [JsonProperty("索滑降点")]
-    public MissionPoint[] MissionPoints;
+    [JsonProperty("任务信息")]
+    public MissionInformation missionInformation;
+    [JsonProperty("应用航空器")]
+    public AircraftInfo[] aircraftInfos;
+    [JsonProperty("任务参数")]
+    public TaskParameter[] ZSJYParameters;
 }
 
-public class DMMHTask
+public class KTKSTask //空投空送任务
 {
     [JsonProperty("任务信息")]
     public MissionInformation missionInformation;
     [JsonProperty("应用航空器")]
     public AircraftInfo[] aircraftInfos;
-    [JsonProperty("地面部署人数")]
-    public double GroundPersonnel;
-    [JsonProperty("机降人数")]
-    public double LandingPersonnel;
-    [JsonProperty("机降点")]
-    public MissionPoint[] MissionPoints;
-    [JsonProperty("下一个任务ID")]
-    public string NextTaskId;
+    [JsonProperty("任务参数")]
+    public TaskParameter[] KTKSParameters;
 }
 
-public class JJJYTask //机降救援
+public class KZDYTask //空中吊运救援任务
 {
     [JsonProperty("任务信息")]
     public MissionInformation missionInformation;
     [JsonProperty("应用航空器")]
     public AircraftInfo[] aircraftInfos;
-    [JsonProperty("单机总机降人数")]
-    public double LandingPersonnel;
-    [JsonProperty("机降点")]
-    public MissionPoint[] MissionPoints;
-    [JsonProperty("下一个任务ID")]
-    public string NextTaskId;
+    [JsonProperty("任务参数")]
+    public TaskParameter[] KTKSParameters;
 }
 
-public class ZSJYTask //着水救援
+public class DMMHTask
 {
     [JsonProperty("任务信息")]
     public MissionInformation missionInformation;
     [JsonProperty("应用航空器")]
     public AircraftInfo[] aircraftInfos;
-    [JsonProperty("单机总机降人数")]
+    [JsonProperty("地面部署人数")]
+    public double GroundPersonnel;
+    [JsonProperty("机降人数")]
     public double LandingPersonnel;
     [JsonProperty("机降点")]
     public MissionPoint[] MissionPoints;
@@ -259,30 +343,10 @@ public class MHTask
     public string NextTaskId;
 }
 
-public class SeaSouJiuTask
+public class CollaborativeMode
 {
-    [JsonProperty("任务信息")]
-    public MissionInformation missionInformation;
-    [JsonProperty("应用航空器")]
-    public AircraftInfo[] aircraftInfos;
-    [JsonProperty("战术战法")]
-    public Tactic Tactic;
-    [JsonProperty("运行约束")]
-    public RunConstraints RunConstraints;
-    //[JsonProperty("目标点ID")]
-    //public int TargetPointId;
-    [JsonProperty("搜索任务载荷")]
-    public SearchMissionPayload[] missionSearchPayloads;
-    [JsonProperty("搜索方式")]
-    public SearchMissionMode[] SearchModes;
-    //[JsonProperty("下一个任务ID")]
-    //public string NextTaskId;
-}
-
-public class Tactic
-{
-    [JsonProperty("战术战法")]
-    public string tactic;
+    [JsonProperty("协同模式")]
+    public string Mode;
     [JsonProperty("跟进间距")]
     public double Spacing;
     [JsonProperty("跟进高度差")]
@@ -291,6 +355,10 @@ public class Tactic
 
 public class RunConstraints
 {
+    [JsonProperty("搜寻速度")]
+    public double searchSpeed;
+    [JsonProperty("夜间工作")]
+    public bool nightWork;
     [JsonProperty("搜索飞行速度限制")]
     public double speedLimit;
 }
@@ -322,6 +390,9 @@ public class SearchMissionPayload //搜索任务载荷
     //红外探测器视场角
     [JsonProperty("红外探测器视场角")]
     public double InfraredDetectorFieldAngle;
+    //背景亮度
+    [JsonProperty("背景亮度")]
+    public double BgBrightness;
     //飞行高度
     [JsonProperty("飞行高度")]
     public double FlightHeight;
@@ -348,26 +419,6 @@ public class SearchMissionMode //搜索方式
     public int JG;
 }
 
-public class LandSouXunTask
-{
-    [JsonProperty("任务信息")]
-    public MissionInformation missionInformation;
-    [JsonProperty("应用航空器")]
-    public AircraftInfo[] aircraftInfos;
-    [JsonProperty("战术战法")]
-    public Tactic Tactic;
-    [JsonProperty("运行约束")]
-    public RunConstraints RunConstraints;
-    //搜索任务载荷
-    [JsonProperty("搜索任务载荷")]
-    public SearchMissionPayload[] missionSearchPayloads;
-    //搜索方式
-    [JsonProperty("搜索方式")]
-    public SearchMissionMode[] SearchModes;
-    //[JsonProperty("下一个任务ID")]
-    //public string NextTaskId;
-}
-
 public class MHTaskConfig
 {
     [JsonProperty("总灭火任务编号")]

Proto2CS/Proto2CS.csproj

@@ -5,5 +5,10 @@
     <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="GeoCoordinate" Version="2.0.1" />
+    <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
+  </ItemGroup>
+
 
 </Project>

SimulationServer/Entity/AircraftDY.cs

@@ -7,7 +7,7 @@ namespace SimulationServer;
 public class AircraftDY : AircraftEntity
 {
     public SHJTask content;
-    public SHJParameter SHJParameter;
+    public TaskParameter SHJParameter;
     public override void End()
     {
         TotalFuelConsumption = TurningPoints[0].RemainingFuel - TurningPoints[^1].RemainingFuel;

SimulationServer/Entity/AircraftLandSJ.cs

@@ -173,8 +173,23 @@ public class AircraftLandSJ : AircraftEntity
                     targetPoint.y);
                 Log.Info("距离：====================" + distance);
 
-                probability =
-                    helper.GetMushiLandProbability(aricraftPoint, visibility, FlightPlanEditor.targetpoint[0]);
+                if (taskContent.missionSearchPayloads[0].SearchPayload == "雷达搜索")
+                {
+                    // Pd0 = 0.5 / Pf0 = Math.Pow(10,-6) / Pf = Math.Pow(10,-6) / R0 = 23645 / sigma0 = 5000 / sigma = Editor雷达截面面积 // R 单位m 
+                    probability = helper.GetRadarPossibility(0.5, Math.Pow(10, -6), Math.Pow(10, -6), 23645, aricraftPoint, FlightPlanEditor.targetpoint[0], FlightPlanEditor.targetpoint[0].TargetType.RadarArea, 5000, visibility);
+                }
+                else if (taskContent.missionSearchPayloads[0].SearchPayload == "目视搜素")
+                {
+                    probability = helper.GetMushiLandProbability(aricraftPoint, visibility, FlightPlanEditor.targetpoint[0]);
+                }
+                else if (taskContent.missionSearchPayloads[0].SearchPayload == "光电（红外）搜索")
+                {
+                    // Lt = 探测目标亮度 Editor / At = 探测目标面积 Editor / τa = 1 / Lb = 3 / A0 = 1 / D0 = 0.075 / Dstar = 3 / τo = 0.8 / Ad = 0.0073728 / Δf = 0.125 / δ = 0.5 / Pf0 = Math.Pow(10, -6);
+                    probability = helper.GetInfraredDetectionProbability(FlightPlanEditor.targetpoint[0].TargetType.TargetBrightness, FlightPlanEditor.targetpoint[0].TargetType.TargetArea, 1, 3, 1, aricraftPoint, FlightPlanEditor.targetpoint[0], 0.075, 3, 0.8, 0073728, 0.125, 0.5, Math.Pow(10, -6));
+                }
+
+                //probability =
+                //    helper.GetMushiLandProbability(aricraftPoint, visibility, FlightPlanEditor.targetpoint[0]);
                 //finalProbability *= (1 - probability); 
 
 

SimulationServer/Entity/AircraftSHJ.cs

@@ -7,7 +7,7 @@ namespace SimulationServer;
 public class AircraftSHJ : AircraftEntity
 {
     public SHJTask content;
-    public SHJParameter SHJParameter;
+    public TaskParameter SHJParameter;
     public override void End()
     {
         TotalFuelConsumption = TurningPoints[0].RemainingFuel - TurningPoints[^1].RemainingFuel;

SimulationServer/Entity/AircraftSJ.cs

@@ -265,19 +265,19 @@ public class AircraftSJ : AircraftEntity
                     currentLocation.CurrentLat,
                     targetPoint.y);
                 Log.Info("距离：====================" + distance);
-                if ("任务载荷" == "雷达搜索")
+                if (taskContent.missionSearchPayloads[0].SearchPayload == "雷达搜索")
                 {
                     // Pd0 = 0.5 / Pf0 = Math.Pow(10,-6) / Pf = Math.Pow(10,-6) / R0 = 23645 / sigma0 = 5000 / sigma = Editor雷达截面面积 // R 单位m 
-                    probability = helper.GetRadarPossibility(0.5, Math.Pow(10, -6), Math.Pow(10, -6), 23645, aricraftPoint, FlightPlanEditor.targetpoint[0], 0.7, 5000, vis);
+                    probability = helper.GetRadarPossibility(0.5, Math.Pow(10, -6), Math.Pow(10, -6), 23645, aricraftPoint, FlightPlanEditor.targetpoint[0], FlightPlanEditor.targetpoint[0].TargetType.RadarArea, 5000, vis);
                 }
-                else if ("任务载荷" == "目视搜素")
+                else if (taskContent.missionSearchPayloads[0].SearchPayload == "目视搜素")
                 {
                     probability = helper.GetMushiSeaProbability(aricraftPoint, vis, waveHigh, FlightPlanEditor.targetpoint[0]);
                 }
-                else if("任务载荷" == "光电（红外）搜索")
+                else if(taskContent.missionSearchPayloads[0].SearchPayload == "光电（红外）搜索")
                 {
                     // Lt = 探测目标亮度 Editor / At = 探测目标面积 Editor / τa = 1 / Lb = 3 / A0 = 1 / D0 = 0.075 / Dstar = 3 / τo = 0.8 / Ad = 0.0073728 / Δf = 0.125 / δ = 0.5 / Pf0 = Math.Pow(10, -6);
-                    probability = helper.GetInfraredDetectionProbability(1, 6.63, 1, 3, 1, aricraftPoint, FlightPlanEditor.targetpoint[0], 0.075, 3, 0.8, 0073728, 0.125, 0.5, Math.Pow(10, -6));
+                    probability = helper.GetInfraredDetectionProbability(FlightPlanEditor.targetpoint[0].TargetType.TargetBrightness, FlightPlanEditor.targetpoint[0].TargetType.TargetArea, 1, 3, 1, aricraftPoint, FlightPlanEditor.targetpoint[0], 0.075, 3, 0.8, 0073728, 0.125, 0.5, Math.Pow(10, -6));
                 }
 
                 // probability = helper.getProbability(aricraftPoint, targetPoint,pb, currentLocation.CurrentCourse,

SimulationServer/EventHandler/CreateTaskEventHandler.cs

@@ -116,7 +116,7 @@ public class CreateMHTaskEventHandler : AEvent<CreateMHTask>
                 foreach (var item in shjTask.SHJParameters)
                 {
                     if (aircraftParameter.Id == item.AircraftId)
-                        missionPoint = item.MissionPoints[0];
+                        missionPoint = item.MissionPoints_SHJ[0];
                 }
                 //创建飞行计划编辑器
                 var flightPlanEditor = FlightPlanEditor.Create(aircraftParameter, config.EditorConfig.cityWeather, originBase, missionPoint, new[] { point });

SimulationServer/EventHandler/ServerStartEventHandler.cs

@@ -107,7 +107,7 @@ public class ServerStartEventHandler : AEvent<ServerStart>
             //Console.WriteLine("仿真次数:" + editorConfig.runCounts);
             Game.EventSystem.Publish(new CreateSeaSJTask
             { EditorConfig = editorConfig, SeaSJTask = seaSJTask });
-            break;
+            //break;
         }
 
         //foreach (var landSXTask in taskConfig.LandSouXunTasks)

SimulationServer/SimulationServer.csproj

@@ -15,6 +15,8 @@
     </ItemGroup>
 
     <ItemGroup>
+      <PackageReference Include="GeoCoordinate" Version="2.0.1" />
+      <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
       <PackageReference Include="NPOI.Excel" Version="2.1.1" />
       <PackageReference Include="NPOIHelper" Version="2.0.13" />
     </ItemGroup>

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

@@ -1,5 +1,5 @@
 {
-    "仿真次数": 10,
+    "仿真次数": 3,
     "想定信息": {
         "想定日期": "2024年6月4日",
         "想定时间": "00时00分00秒"

ThirdParty/ThirdParty.csproj

@@ -7,6 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="GeoCoordinate" Version="2.0.1" />
+      <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
       <PackageReference Include="MySql.Data" Version="8.1.0" />
       <PackageReference Include="UniTask" Version="2.4.1" />
     </ItemGroup>