diff --git a/aerpaw/config/scenario_2uavs.csv b/aerpaw/config/scenario_2uavs.csv index c4e2592..a2a5400 100644 --- a/aerpaw/config/scenario_2uavs.csv +++ b/aerpaw/config/scenario_2uavs.csv @@ -1,2 +1,2 @@ timestep, maxIter, minAlt, discretizationStep, protectedRange, initialStepSize, barrierGain, barrierExponent, collisionRadius, comRange, alphaDist, betaDist, alphaTilt, betaTilt, domainMin, domainMax, objectivePos, objectiveVar, sensorPerformanceMinimum, initialPositions, numObstacles, obstacleMin, obstacleMax -5, 100, 30.0, 0.1, 2.0, 3.0, 100, 3, "6.0, 6.0", "20.0, 20.0", "80.0, 80.0", "0.25, 0.25", "5.0, 5.0", "0.1, 0.1", "0.0, 0.0", "80.0, 80.0", "55.0, 55.0", "40, 25, 25, 40", 0.15, "15.0, 10.0, 40.0, 5.0, 10.0, 45.0", 1, "1.0, 25.0, 0.0", "30.0, 30.0, 50.0" \ No newline at end of file +5, 100, 30.0, 0.1, 2.0, 3.0, 100, 3, "6.0, 6.0", "20.0, 20.0", "80.0, 80.0", "0.25, 0.25", "5.0, 5.0", "0.1, 0.1", "0.0, 0.0, 0.0", "80.0, 80.0, 80.0", "55.0, 55.0", "40, 25, 25, 40", 0.15, "15.0, 10.0, 40.0, 5.0, 10.0, 45.0", 1, "1.0, 25.0, 0.0", "30.0, 30.0, 50.0" \ No newline at end of file diff --git a/aerpaw/results/resultsAnalysis.m b/aerpaw/results/resultsAnalysis.m index e5d29b0..791ba4c 100644 --- a/aerpaw/results/resultsAnalysis.m +++ b/aerpaw/results/resultsAnalysis.m @@ -10,7 +10,7 @@ seaToGroundLevel = 110; % measured approximately from USGS national map viewer %% Run simulation % Run miSim using same AERPAW scenario definition CSV -csvPath = fullfile(matlab.project.rootProject().RootFolder, "aerpaw", "config", "scenario_2uavs.csv"); +csvPath = fullfile(matlab.project.rootProject().RootFolder, "aerpaw", "config", "scenario.csv"); params = readScenarioCsv(csvPath); % Visualization settings