From 35365e0a0103a33772f36256e9e1cbab315f39ea Mon Sep 17 00:00:00 2001 From: cs-powell <142438185+cs-powell@users.noreply.github.com> Date: Sat, 5 Apr 2025 18:29:29 -0400 Subject: [PATCH] PROJECT V1.0 -- Data collection ready, experiment setup ready, control schemes ready --- Python3/src/cognitiveModel.py | 6 +++--- Python3/src/testPlatform.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Python3/src/cognitiveModel.py b/Python3/src/cognitiveModel.py index 3137e92..57ef097 100644 --- a/Python3/src/cognitiveModel.py +++ b/Python3/src/cognitiveModel.py @@ -109,7 +109,7 @@ class AircraftLandingModel(pyactr.ACTRModel): self.target_Long = -104.696032 self.target_descent_rate = 500 self.target_altitude = -998 - self.target_pitch = 20 + self.target_pitch = 25 self.targets = [self.target_airspeed,self.target_roll,self.target_heading,self.target_Lat,self.target_Long,self.target_descent_rate,self.target_altitude,self.target_pitch] @@ -221,7 +221,7 @@ class AircraftLandingModel(pyactr.ACTRModel): 0, 0] - current = [str(round(self.dictionaryAccess(self.destinations,"pitch"),3)), + current = [str(round(self.dictionaryAccess(self.destinations,"airspeed"),3)), str(round(self.dictionaryAccess(self.destinations,"roll"),3)), str(round(self.dictionaryAccess(self.destinations,"heading"),3)), str(round(self.dictionaryAccess(self.destinations,"longitude"),6)), @@ -312,7 +312,7 @@ class AircraftLandingModel(pyactr.ACTRModel): scaleFactor.SCALEYOKEPULL) if(self.dictionaryAccess(self.phaseFlags,"flare") == False): - self.target_pitch = 10 + self.target_pitch = 20 yoke_pull, self.integral_airspeed = self.proportionalIntegralControl(1,self.dictionaryAccess(self.destinations,"pitch"), self.target_pitch, self.integral_pitch, diff --git a/Python3/src/testPlatform.py b/Python3/src/testPlatform.py index e516623..59025a6 100644 --- a/Python3/src/testPlatform.py +++ b/Python3/src/testPlatform.py @@ -52,7 +52,7 @@ def experimentSetUp(client,currentConditions,newExperiment): altitudeMETERS = altitudeFEET/3.281 altitude = altitudeMETERS print(str(altitude)) - location1 = [20, -998, 39.96239, -104.69713, altitude, -998, -998, -998, -998] + location1 = [20, -998, 39.96239, -104.696032, altitude, -998, -998, -998, -998] # testLocation = [20, -998, 27.20579, -80.08621, altitude, -998, -998, -998, -998] # 27.20579°N/80.08621°W data = [ location1\ @@ -127,7 +127,7 @@ def experimentSetUp(client,currentConditions,newExperiment): client.pauseSim(False) print("Setting initial velocity") zInit = "sim/flightmodel/position/local_vz" - client.sendDREF(zInit, 80) + client.sendDREF(zInit, 50) print("setup complete")