|
|
@@ -50,7 +50,7 @@ public class AircraftLandSJ : AircraftEntity
|
|
|
trajectory.Add(new double[]
|
|
|
{
|
|
|
item[1],item[0]
|
|
|
- }) ;
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
var points = SeaSJ.getminEnclosingRect(trajectory);
|
|
|
@@ -75,7 +75,7 @@ public class AircraftLandSJ : AircraftEntity
|
|
|
{
|
|
|
route.Add(new double[]
|
|
|
{
|
|
|
- point.lat, point.lon,
|
|
|
+ point.lat, point.lon,3500
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
@@ -90,14 +90,21 @@ public class AircraftLandSJ : AircraftEntity
|
|
|
{
|
|
|
airRoutes.Add(new AirRoute
|
|
|
{
|
|
|
- AirRouteLatitude = item[1],
|
|
|
- AirRouteLongitude = item[0],
|
|
|
+ AirRouteLatitude = item[0],
|
|
|
+ AirRouteLongitude = item[1],
|
|
|
AirRouteHeight = item[2]
|
|
|
});
|
|
|
}
|
|
|
|
|
|
FlightPlanEditor.airroute = airRoutes.ToArray();
|
|
|
|
|
|
+ FlightPlanEditor.missionpoint = new MissionPoint()
|
|
|
+ {
|
|
|
+ MissionPointLongitude = FlightPlanEditor.airroute[0].AirRouteLongitude,
|
|
|
+ MissionPointLatitude = FlightPlanEditor.airroute[0].AirRouteLatitude,
|
|
|
+ MissionPointHeight = FlightPlanEditor.airroute[0].AirRouteHeight
|
|
|
+ };
|
|
|
+
|
|
|
FXJHGenerate.FromStartToMission(FlightPlanEditor, ref TurningPoints); //生成从起点到任务段起点的航路点
|
|
|
|
|
|
// TODO 与王子涵确认这个方法
|
|
|
@@ -105,6 +112,13 @@ public class AircraftLandSJ : AircraftEntity
|
|
|
|
|
|
FXJHGenerate.FXJHTPDiedai(FlightPlanEditor, ref TurningPoints, Velocitys, FuelConsumptions);
|
|
|
|
|
|
+
|
|
|
+ double3 targetPoint = new double3(FlightPlanEditor.targetpoint[0].TargetPointLongitude,
|
|
|
+ FlightPlanEditor.targetpoint[0].TargetPointLatitude,
|
|
|
+ FlightPlanEditor.targetpoint[0].TargetPointHeight);
|
|
|
+
|
|
|
+ double a = helper.getPb(targetPoint.x, targetPoint.y);
|
|
|
+
|
|
|
getNCData = new GetNCData();
|
|
|
getNCData.GetData();
|
|
|
Task.Run(() =>
|
|
|
@@ -124,9 +138,6 @@ public class AircraftLandSJ : AircraftEntity
|
|
|
double3 aricraftPoint = new double3(currentLocation.CurrentLon, currentLocation.CurrentLat,
|
|
|
currentLocation.CurrentHei);
|
|
|
|
|
|
- double3 targetPoint = new double3(FlightPlanEditor.targetpoint[0].TargetPointLongitude,
|
|
|
- FlightPlanEditor.targetpoint[0].TargetPointLatitude,
|
|
|
- FlightPlanEditor.targetpoint[0].TargetPointHeight);
|
|
|
|
|
|
|
|
|
var distance = Utils.Util.GetDistance(currentLocation.CurrentLon, targetPoint.x,
|
|
|
@@ -134,10 +145,10 @@ public class AircraftLandSJ : AircraftEntity
|
|
|
targetPoint.y);
|
|
|
Log.Info("距离：====================" + distance);
|
|
|
|
|
|
- if (distance < 20)
|
|
|
+ if (distance < 3.2)
|
|
|
{
|
|
|
//TODO 和学生对接确认， 发现概率算法
|
|
|
- probability = helper.getProbability(aricraftPoint, targetPoint, currentLocation.CurrentCourse,
|
|
|
+ probability = helper.getProbability(aricraftPoint, targetPoint, a, currentLocation.CurrentCourse,
|
|
|
10, 10, "遇险人员", "陆地"); // 计算发现概率，需要其他模型输入 // 计算发现概率，需要其他模型输入
|
|
|
}
|
|
|
|
|
|
@@ -145,9 +156,10 @@ public class AircraftLandSJ : AircraftEntity
|
|
|
//finalProbability *= (1 - probability);
|
|
|
|
|
|
Console.WriteLine(
|
|
|
- $"陆上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，最终概率：{1 - finalProbability}，是否看到遇险人员：{isseePerson}");
|
|
|
-
|
|
|
- double randomValue = random.NextDouble(); // 生成随机数比较概率
|
|
|
+ $"陆上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，是否看到遇险人员：{isseePerson}");
|
|
|
+ double randomValue = random.NextInt64(9500,10000); // 生成随机数比较概率
|
|
|
+ randomValue /= 10000;
|
|
|
+ //probability -= 0.5;
|
|
|
if (randomValue < probability) // 1 - finalProbability
|
|
|
{
|
|
|
isseePerson = true;
|
|
|
@@ -161,12 +173,17 @@ public class AircraftLandSJ : AircraftEntity
|
|
|
}
|
|
|
|
|
|
temptime += 10;
|
|
|
+ if(temptime >= taskContent.missionInformation.TaskEndConditions.TaskTime)
|
|
|
+ {
|
|
|
+ IsOver = true;
|
|
|
+ isseePerson = 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}，是否看到遇险人员：{isseePerson}");
|
|
|
+ $"陆上任务：{taskContent.missionInformation.MissionName} 机型： {AircraftId} 当前时间：{temptime}，当前位置：{currentLocation.CurrentLon},{currentLocation.CurrentLat},{currentLocation.CurrentHei}，概率：{probability}，是否看到遇险人员：{isseePerson}");
|
|
|
|
|
|
//finalProbability = 1 - finalProbability;
|
|
|
|
|
|
@@ -224,6 +241,7 @@ public class AircraftLandSJAwakeSystem : AwakeSystem<AircraftLandSJ, FlightPlanE
|
|
|
public override void Awake(AircraftLandSJ self, FlightPlanEditor flightPlanEditor)
|
|
|
{
|
|
|
self.FlightPlanEditor = flightPlanEditor;
|
|
|
+ self.helper = new EquationHelper(HttpInterface.baseUrl);
|
|
|
self.Awake();
|
|
|
}
|
|
|
}
|
liyang