Merged also elements, where different gas instance is used

jirkapok · Oct 2, 2024 · e425a03 · e425a03
1 parent 3e47d2e
commit e425a03
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/projects/planner/src/app/shared/options.service.ts b/projects/planner/src/app/shared/options.service.ts
@@ -278,8 +278,4 @@ export class OptionsService {
         this.options.maxEND =this.units.toMeters(newValues.maxEND);
         OptionDefaults.useGeneralRecommended(this.options);
     }
-
-    // TODO air breaks
-    // add to recommended options sets? (consider also Gradient factors)
-    // merge gas switch level with following segment on the same gas
 }
diff --git a/projects/scuba-physics/src/lib/Segments.spec.ts b/projects/scuba-physics/src/lib/Segments.spec.ts
@@ -38,12 +38,13 @@ describe('Segments', () => {
 
         beforeEach(() => {
             filledSegments = new Segments();
-            filledSegments.add(20, StandardGases.air, 15);
-            filledSegments.add(20, StandardGases.air, 15);
-            filledSegments.add(20, StandardGases.air, 35);
-            filledSegments.add(5, StandardGases.air, 35);
-            filledSegments.add(5, StandardGases.air, 3);
-            filledSegments.add(5, StandardGases.air, 3);
+            // use copy to enforce content comparison
+            filledSegments.add(20, StandardGases.air.copy(), 15);
+            filledSegments.addFlat(StandardGases.air.copy(), 15);
+            filledSegments.addFlat(StandardGases.air.copy(), 35);
+            filledSegments.add(5, StandardGases.air.copy(), 35);
+            filledSegments.addFlat(StandardGases.air.copy(), 3);
+            filledSegments.addFlat(StandardGases.air.copy(), 3);
         });
 
 

diff --git a/projects/scuba-physics/src/lib/Segments.ts b/projects/scuba-physics/src/lib/Segments.ts
@@ -161,7 +161,7 @@ export class Segment {
 
     public contentEquals(toCompare: Segment): boolean {
         return this.speed === toCompare.speed &&
-            this._gas === toCompare._gas;
+            this._gas.compositionEquals(toCompare._gas);
     }
 
     /**