gitea-mirror/KSP-MGA-Planner
1
0
Fork 0
mirror of https://github.com/Krafpy/KSP-MGA-Planner.git synced 2025-12-12 07:40:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored custom sequence parsing

Browse Source 
Initials no longer limited to 2 characters, but require enough
characters avoid ambiguity between bodies.
This commit is contained in:
Krafpy
2024-12-11 19:03:48 +01:00
parent 703eb06236
commit 28dce7952c
4 changed files with 62 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dist/main/editor/editor.js vendored
View File

@@ -264,10 +264,13 @@ export async function initEditorWithSystem(systems, systemIndex) {
systemSelector.disable();
try {
let sequence;
if (customSequence.value != "")
if (customSequence.value != "") {
sequence = FlybySequence.fromString(customSequence.value, system);
else
console.debug(sequence.seqStringFullNames);
}
else {
sequence = sequenceSelector.sequence;
}
updateAltitudeRange(depAltitude, sequence.bodies[0]);
const slen = sequence.length;
updateAltitudeRange(destAltitude, sequence.bodies[slen - 1]);
@@ -294,7 +297,7 @@ export async function initEditorWithSystem(systems, systemIndex) {
maxDurationSeconds = maxDuration.value * 24 * 3600;
}
}
console.log(maxDurationSeconds);
console.debug(maxDurationSeconds);
resetFoundTrajectory();
const userSettings = {
startDate: startDate,

38
dist/main/solvers/sequence.js vendored
View File

@@ -16,27 +16,33 @@ export class FlybySequence {
}
static fromString(str, system) {
str = str.trim();
const initials = str.split('-');
const initialsList = str.split('-').map(s => s.trim());
const ids = [];
let attractor = 0;
for (let i = 0; i < initials.length; i++) {
let valid = false;
let attractorId = 0;
for (let i = 0; i < initialsList.length; i++) {
const initials = initialsList[i];
if (initials.length < 2)
throw new Error("Body sequence initials must contain at least 2 characters.");
const bodiesWithInitials = [];
for (const body of system.orbiting) {
if (body.name.substring(0, 2) == initials[i]) {
if (i == 0) {
attractor = body.attractor.id;
}
else if (body.attractor.id != attractor) {
throw new Error("All bodies of the sequence must orbit around the same body.");
}
ids.push(body.id);
valid = true;
break;
if (body.name.toLowerCase().startsWith(initials.toLowerCase())) {
bodiesWithInitials.push(body);
}
}
if (!valid) {
throw new Error("Invalid custom sequence input.");
if (bodiesWithInitials.length >= 2) {
const bodyNames = bodiesWithInitials.map(body => body.name);
throw new Error(`Ambiguous initials \"${initials}\": ${joinStrings(bodyNames, ", ")}.`);
}
if (bodiesWithInitials.length == 0)
throw new Error(`Invalid custom sequence body initials \"${initials}\".`);
const body = bodiesWithInitials[0];
if (i == 0) {
attractorId = body.attractor.id;
}
else if (body.attractor.id != attractorId) {
throw new Error("All bodies of the sequence must orbit around the same body.");
}
ids.push(body.id);
}
if (ids.length <= 1) {
throw new Error("The sequence must contain at least two bodies.");

8
src/main/editor/editor.ts
View File

@@ -343,10 +343,12 @@ export async function initEditorWithSystem(systems: SolarSystemData[], systemInd
systemSelector.disable();
try {
let sequence: FlybySequence;
if(customSequence.value != "")
if(customSequence.value != "") {
sequence = FlybySequence.fromString(customSequence.value, system);
else
console.debug(sequence.seqStringFullNames);
} else {
sequence = sequenceSelector.sequence;
}
updateAltitudeRange(depAltitude, sequence.bodies[0]);
const slen = sequence.length;
@@ -378,7 +380,7 @@ export async function initEditorWithSystem(systems: SolarSystemData[], systemInd
maxDurationSeconds = maxDuration.value * 24*3600;
}
}
console.log(maxDurationSeconds);
console.debug(maxDurationSeconds);
resetFoundTrajectory();

45
src/main/solvers/sequence.ts
View File

@@ -25,28 +25,41 @@ export class FlybySequence {
static fromString(str: string, system: SolarSystem){
str = str.trim();
const initials = str.split('-');
const initialsList = str.split('-').map(s => s.trim());
const ids: number[] = [];
let attractorId = 0;
let attractor = 0;
for(let i = 0; i < initialsList.length; i++) {
const initials = initialsList[i];
for(let i = 0; i < initials.length; i++){
let valid = false;
for(const body of system.orbiting){
if(body.name.substring(0, 2) == initials[i]){
if(i == 0) {
attractor = body.attractor.id;
} else if(body.attractor.id != attractor) {
throw new Error("All bodies of the sequence must orbit around the same body.");
}
ids.push(body.id);
valid = true;
break;
// at least 2 characters
if (initials.length < 2)
throw new Error("Body sequence initials must contain at least 2 characters.");
// check for ambiguity and validity
const bodiesWithInitials: OrbitingBody[] = [];
for (const body of system.orbiting) {
if (body.name.toLowerCase().startsWith(initials.toLowerCase())) {
bodiesWithInitials.push(body);
}
}
if(!valid){
throw new Error("Invalid custom sequence input.");
if (bodiesWithInitials.length >= 2) {
const bodyNames = bodiesWithInitials.map(body => body.name);
throw new Error(`Ambiguous initials \"${initials}\": ${joinStrings(bodyNames, ", ")}.`);
}
if (bodiesWithInitials.length == 0)
throw new Error(`Invalid custom sequence body initials \"${initials}\".`);
const body = bodiesWithInitials[0];
// check for same attractor
if (i == 0) {
attractorId = body.attractor.id;
} else if (body.attractor.id != attractorId) {
throw new Error("All bodies of the sequence must orbit around the same body.");
}
ids.push(body.id);
}
if(ids.length <= 1){