Removed redundant ProfileMoment

Author: jirkapok

projects/planner/src/app/plan/diveinfo/diveinfo.component.ts

@@ -7,7 +7,7 @@ import {
 } from '@fortawesome/free-solid-svg-icons';
 import { MdbTabsComponent } from 'mdb-angular-ui-kit/tabs/tabs.component';
 
-import { Tank, GasToxicity, Time, ProfileMoment } from 'scuba-physics';
+import { Tank, GasToxicity, Time } from 'scuba-physics';
 import { DiveResults } from '../../shared/diveresults';
 import { UnitConversion } from '../../shared/UnitConversion';
 import { Streamed } from '../../shared/streamed';
@@ -92,11 +92,11 @@ export class DiveInfoComponent extends Streamed {
     }
 
     public get offgasingStartTime(): number {
-        return Time.toMinutes(this.dive.offgasingStart.runtime);
+        return Time.toMinutes(this.dive.offgasingStartTime);
     }
 
     public get offgasingStartDepth(): number {
-        return this.dive.offgasingStart.depth;
+        return this.dive.offgasingStartDepth;
     }
 
     public get dive(): DiveResults {

projects/planner/src/app/shared/diveresults.ts

@@ -1,6 +1,6 @@
 import {
     Ceiling, EventType, Event, HighestDensity,
-    OtuCalculator, LoadedTissue, TissueOverPressures, ProfileMoment
+    OtuCalculator, LoadedTissue, TissueOverPressures
 } from 'scuba-physics';
 import { Injectable } from '@angular/core';
 import { WayPoint } from './wayPoint';
@@ -20,10 +20,8 @@ export class DiveResults {
     public emergencyAscentStart = 0;
     public averageDepth = 0;
     public surfaceGradient = 0;
-    public offgasingStart: ProfileMoment = {
-        runtime: 0,
-        depth: 0
-    };
+    public offgasingStartTime = 0;
+    public offgasingStartDepth = 0;
     public otu = 0;
     public cns = 0;
     public highestDensity = HighestDensity.createDefault();

projects/planner/src/app/shared/planner.service.spec.ts

@@ -422,7 +422,8 @@ describe('PlannerService', () => {
                         averageDepth: 0,
                         events: [],
                         surfaceGradient: 0,
-                        offgasingStart: { runtime: 0, depth: 0 }
+                        offgasingStartTime: 0,
+                        offgasingStartDepth: 0
                     }));
 
                 expect( () => planner.calculate(1)).not.toThrow();

projects/planner/src/app/shared/planner.service.ts

@@ -177,9 +177,8 @@ export class PlannerService extends Streamed {
         const events = DtoSerialization.toEvents(diveInfoResult.events);
         diveResult.events = this.ignoredIssues.filterIgnored(events.items);
         diveResult.surfaceGradient = diveInfoResult.surfaceGradient;
-
-        // TODO find depth for the offgasing start runtime
-        diveResult.offgasingStart = diveInfoResult.offgasingStart;
+        diveResult.offgasingStartTime = diveInfoResult.offgasingStartTime;
+        diveResult.offgasingStartDepth = diveInfoResult.offgasingStartDepth;
         diveResult.diveInfoFinished();
         this.fireFinishedEvents(dive);
     }

projects/planner/src/app/shared/serialization.model.ts

@@ -1,6 +1,6 @@
 import {
     Tank, Ceiling, EventType,
-    Salinity, SafetyStop, ProfileMoment,
+    Salinity, SafetyStop,
     TissueOverPressures
 } from 'scuba-physics';
 import { ViewState } from './views.model';
@@ -93,7 +93,8 @@ export interface DiveInfoResultDto {
     averageDepth: number;
     events: EventDto[];
     surfaceGradient: number;
-    offgasingStart: ProfileMoment;
+    offgasingStartTime: number;
+    offgasingStartDepth: number;
 }
 
 export interface DensityDto {

projects/planner/src/app/workers/planning.tasks.ts

@@ -3,7 +3,7 @@ import {
     Consumption, Time, Diver, OtuCalculator, CnsCalculator,
     DensityAtDepth, EventOptions, AlgorithmParams, BuhlmannAlgorithm,
     RestingParameters, Segment, PlanFactory, ConsumptionOptions,
-    ProfileMoment, Tank, ProfileTissues
+    Tank, ProfileTissues
 } from 'scuba-physics';
 import {
     ProfileRequestDto, ProfileResultDto, ConsumptionRequestDto,
@@ -57,7 +57,7 @@ export class PlanningTasks {
 
         const profileTissues = new ProfileTissues();
         const surfaceGradient = profileTissues.surfaceGradient(task.calculatedTissues, depthConverter.surfacePressure);
-        const offgasingStartRuntime = profileTissues.offgasingStart(task.calculatedOverPressures).runtime;
+        const offgasingStartRuntime = profileTissues.offgasingStart(task.calculatedOverPressures);
         const offgasingStartDepth = Segments.depthAt(originalProfile, offgasingStartRuntime);
 
         return {
@@ -69,10 +69,8 @@ export class PlanningTasks {
             averageDepth: averageDepth,
             events: eventsDto,
             surfaceGradient: surfaceGradient,
-            offgasingStart: {
-                runtime: Time.toMinutes(offgasingStartRuntime),
-                depth: offgasingStartDepth
-            }
+            offgasingStartTime: Time.toMinutes(offgasingStartRuntime),
+            offgasingStartDepth: offgasingStartDepth
         };
     }
 

projects/scuba-physics/src/lib/ProfileTissues.spec.ts

@@ -47,7 +47,7 @@ describe('Profile tissues', () => {
         it('Empty saturation returns dive start', () => {
             const overPressures: TissueOverPressures[] = [];
             const result = sut.offgasingStart(overPressures);
-            expect(result).toEqual({ runtime: 0, depth: 0 });
+            expect(result).toEqual(0);
         });
 
         it('Wrong number of tissues in any sample throws Error', () => {
@@ -58,25 +58,25 @@ describe('Profile tissues', () => {
         it('No submerging saturation returns dive start', () => {
            const overPressures = createFilledOverPressures([0, 0, 0, 0, 0]);
            const result = sut.offgasingStart(overPressures);
-           expect(result).toEqual({ runtime: 0, depth: 0 });
+           expect(result).toEqual(0);
         });
 
         it('Simple profile saturation returns 5th sample index', () => {
             const overPressures = createFilledOverPressures([0, -0.1, -0.2, -0.1, 0, 0.1, 0.1]);
             const result = sut.offgasingStart(overPressures);
-            expect(result).toEqual({ runtime: 5, depth: 0 });
+            expect(result).toEqual(5);
         });
 
         it('Multi-level profile saturation returns 5th sample index', () => {
             const overPressures = createFilledOverPressures([0, -0.1, 0, 0.1, -0.1, 0, 0.1, 0.1]);
             const result = sut.offgasingStart(overPressures);
-            expect(result).toEqual({ runtime: 6, depth: 0 });
+            expect(result).toEqual(6);
         });
 
         it('5th tissues stops offgasing on long deco stop', () => {
             const overPressures = createFilledOverPressures([0, -0.1, 0, 0.1, 0, 0.1, 0.1]);
             const result = sut.offgasingStart(overPressures);
-            expect(result).toEqual({ runtime: 3, depth: 0 });
+            expect(result).toEqual(3);
         });
 
         it('5th tissues is not the leading tissue', () => {
@@ -86,7 +86,7 @@ describe('Profile tissues', () => {
             overPressures[3][4] = 0.1;
 
             const result = sut.offgasingStart(overPressures);
-            expect(result).toEqual({ runtime: 3, depth: 0 });
+            expect(result).toEqual(3);
         });
     });
 });

projects/scuba-physics/src/lib/ProfileTissues.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { LoadedTissue, ProfileMoment, TissueOverPressures } from "./Tissues.api";
+import { LoadedTissue, TissueOverPressures } from "./Tissues.api";
 import { Tissues } from "./Tissues";
 
 export class ProfileTissues {
@@ -22,7 +22,7 @@ export class ProfileTissues {
      * The required values are calculated using Tissues.saturationRatio method.
      * @returns Index of first overpressure sample, where saturation speed is positive.
      **/
-    public offgasingStart(tissueOverPressures: TissueOverPressures[]): ProfileMoment {
+    public offgasingStart(tissueOverPressures: TissueOverPressures[]): number {
         const tissue5index = 4;
 
         // multilevel dives may switch multiple times between on/offgasing
@@ -38,6 +38,6 @@ export class ProfileTissues {
 
         // Not submerged or never offgased
         foundIndex = (foundIndex < 0 || foundIndex >= tissueOverPressures.length - 1) ? 0 : foundIndex;
-        return { runtime: foundIndex, depth: 0 };
+        return foundIndex;
     }
 }

projects/scuba-physics/src/lib/Segments.ts

@@ -258,7 +258,7 @@ export class Segments {
     }
 
     /**
-     * Find depth in bars, at which the diver was at given runtime in seconds for given profile.
+     * Find depth in meters, at which the diver was at given runtime in seconds for given profile.
      **/
     public static depthAt(profile: Segment[], runtime: number): number {
         // TODO implement method Segments.depthAt

projects/scuba-physics/src/lib/Tissues.api.ts

@@ -26,10 +26,3 @@ export interface LoadedTissue {
      */
     pHe: number;
 }
-
-export interface ProfileMoment {
-    /** In seconds from start of the dive */
-    runtime: number;
-    /** In meters */
-    depth: number;
-}