Refactor spaces

src/calculations/calculator.ts

@@ -128,6 +128,7 @@ export default class Calculator {
   #addCustomSpace (name: string, result: ISpaceResult): ISpace {
     return {
       name,
+      className: 'Dummy',
       result,
       constants: {
         areaPerRole: 0,
@@ -344,7 +345,7 @@ export default class Calculator {
    */
   #calculateSpaceFirstRun (space: ISpace): ISpaceResult {
     const Space = getSpace(space.name)
-    const spaceCalculation: ISpaceCalculation = new Space(space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
+    const spaceCalculation: ISpaceCalculation = new Space(this.variables, this.config, this.customSpaceConstants, this.customConstants, space)
     return {
       areaExclCompensation: spaceCalculation.calculateAreaExclCompensation(),
       employeesPerWorkplaceTypeUnadjusted: spaceCalculation.calculateEmployeesPerWorkplaceTypeUnadjusted(),
@@ -358,7 +359,7 @@ export default class Calculator {
    */
   #calculateSpaceSecondRun (space: ISpace): ISpaceResult {
     const Space = getSpace(space.name)
-    const spaceCalculation: ISpaceCalculation = new Space(space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
+    const spaceCalculation: ISpaceCalculation = new Space(this.variables, this.config, this.customSpaceConstants, this.customConstants, space)
     return {
       notAdjustedAddonArea: spaceCalculation.calculateNotAdjustedAddonArea(this.totalWorkplaceArea, this.totalCompensationArea),
     }
@@ -371,7 +372,7 @@ export default class Calculator {
    */
   #calculateSpaceThirdRun (space: ISpace): ISpaceResult {
     const Space = getSpace(space.name)
-    const spaceCalculation: ISpaceCalculation = new Space(space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
+    const spaceCalculation: ISpaceCalculation = new Space(this.variables, this.config, this.customSpaceConstants, this.customConstants, space)
     return {
       notAdjustedAddonPart: spaceCalculation.calculateNotAdjustedAddonPart(this.totalWorkplaceArea, this.totalCompensationArea),
       adjustedAddonArea: spaceCalculation.calculateAdjustedAddonArea(this.totalWorkplaceArea, this.totalCompensationArea, this.totalUnadjustedArea),
@@ -387,7 +388,7 @@ export default class Calculator {
    */
   #calculateSpaceFourthRun (space: ISpace): ISpaceResult {
     const Space = getSpace(space.name)
-    const spaceCalculation: ISpaceCalculation = new Space(space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
+    const spaceCalculation: ISpaceCalculation = new Space(this.variables, this.config, this.customSpaceConstants, this.customConstants, space)
     return {
       adjustedAreaInclCompensationWithAdjustmentAndCompensation: spaceCalculation.calculateAdjustedAreaInclCompensationWithAdjustmentAndCompensation(),
       numberOfRooms: spaceCalculation.calculateNumberOfRooms(),

src/calculations/helpers.ts

@@ -0,0 +1,22 @@
+import { ISpace } from './interfaces/space'
+
+/**
+ * This function returns the space information from an array of space spaces. Recursively until found.
+ * @param {string} spaceClassName - The name of the space
+ * @param {ISpace[]} spaces - The array of spaces
+ * @returns {ISpace|void}
+ */
+const findSpace = (spaceClassName: string, spaces: ISpace[]): ISpace|void => {  
+  for (const space of spaces) {
+    if (space.className === spaceClassName) {
+      return space
+    } else if (space.spaces) {
+      const foundSpace = findSpace(spaceClassName, space.spaces)
+      if (foundSpace) {
+        return foundSpace
+      }
+    }
+  }
+}
+
+export { findSpace }

src/calculations/interfaces/space.ts

@@ -8,4 +8,5 @@ export interface ISpace {
   result: ISpaceResult // The result of the calculations for this space
   shouldCalculateCorridor?: boolean // Whether to calculate the corridor area needed for this space
   shouldCalculateInnerwalls?: boolean // Whether to calculate the inner walls area needed for this space
+  className: string // The name of the class of this space
 }

src/calculations/spaces/common area/lobby.ts

@@ -10,8 +10,8 @@ export default class Lobby extends MainSpace {
   calculateAreaExclCompensation = (): number => {
     if (this.variables.accessToAuditorium || this.variables.accessToCourseSpace) {
       // Get the area of the auditorium and the course space
-      const auditorium = new Auditorium(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const course = new Course(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const auditorium = new Auditorium(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const course = new Course(this.variables, this.config, this.customSpaceConstants, this.customConstants)
       const areaPerPerson = this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType
 
       const x = auditorium.calculateAreaExclCompensation() / areaPerPerson

src/calculations/spaces/dummy.ts

@@ -10,6 +10,7 @@ export default class Dummy extends MainSpace {
   constructor(variables: IVariable, config: IConfig) {
     const space: ISpace = {
       name: "dummy",
+      className: "Dummy",
       result: {},
       constants: {
         seatPersonRoom: "person",
@@ -22,7 +23,7 @@ export default class Dummy extends MainSpace {
         adhereToGovernmentMinimum: false
       }
     }
-    super(space, variables, config)
+    super(variables, config)
     this.name = this.space.name
     this.space = space
     this.spaceConstants = space.constants

src/calculations/spaces/main_space_class.ts

@@ -4,6 +4,7 @@ import { ISpaceConstant } from '../interfaces/space_constant'
 import { ISpaceCalculation } from '../interfaces/space_calculation'
 import { IConstant } from '../interfaces/constant'
 import { IVariable } from '../interfaces/variable'
+import { findSpace } from '../helpers'
 
 type TCustomSpaceConstants = {[key:string]:ISpaceConstant}
 
@@ -22,13 +23,16 @@ export default class MainSpace implements ISpaceCalculation {
 
   /**
    * Constructor for the main space class.
-   * @param {Ispace} space - The space to calculate
+   * @param {Ispace|string} space - The space to calculate
    * @param {IVariable} variables - The variables to use
    * @param {IConfig} config - The config to use
    * @param {TCustomSpaceConstants} [customSpaceConstants] - Custom space constants, optional
    * @param {IConstant} [customConstants] - Custom constants, optional
    */
-  constructor(space: ISpace, variables: IVariable, config: IConfig, customSpaceConstants?: TCustomSpaceConstants, customConstants?: IConstant) {
+  constructor(variables: IVariable, config: IConfig, customSpaceConstants?: TCustomSpaceConstants, customConstants?: IConstant, space?: ISpace) {
+    if (!space) {
+      space = findSpace(this.constructor.name, config.spaces)!
+    }
     this.name = space.name
     this.space = space
     this.spaceConstants = space.constants
@@ -153,7 +157,7 @@ export default class MainSpace implements ISpaceCalculation {
    */
   calculateNumberOfRooms (): number {
     if (this.spaceConstants.shouldCalculateNumberOfRooms) {
-      return Math.ceil(this.space.result.adjustedAreaInclCompensation! / this.spaceConstants.minimumSquareMeters!)
+      return Math.floor(this.space.result.adjustedAreaInclCompensation! / this.spaceConstants.minimumSquareMeters!)
     }
     return 0
   }

src/calculations/spaces/shared area/meetingroom_large.ts

@@ -5,6 +5,8 @@ import Landscape from '../work related area/landscape'
 import Projectroom from '../work related area/projectroom'
 import Focusroom from '../work related area/focusroom'
 import Quietzone from '../work related area/quietzone'
+import SharedSmallMeetingroom from './meetingroom_small'
+import SharedMediumMeetingroom from './meetingroom_medium'
 
 export default class SharedLargeMeetingroom extends MainSpace {
   /**
@@ -21,14 +23,17 @@ export default class SharedLargeMeetingroom extends MainSpace {
    */
   calculateAreaExclCompensation = (): number => {
     if (this.variables.accessToCoworking) {
-      const workDockin = new WorkDockin(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const cellOffice = new CellOffice(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const landscape = new Landscape(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const projectroom = new Projectroom(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const focusroom = new Focusroom(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const quietzone = new Quietzone(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const landscape = new Landscape(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const projectroom = new Projectroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const focusroom = new Focusroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const quietzone = new Quietzone(this.variables, this.config, this.customSpaceConstants, this.customConstants)
       const addedPeakAreaSum = workDockin.calculateEmployeesPerWorkplaceTypeUnadjusted() + cellOffice.calculateEmployeesPerWorkplaceTypeUnadjusted() + landscape.calculateEmployeesPerWorkplaceTypeUnadjusted() + projectroom.calculateEmployeesPerWorkplaceTypeUnadjusted() + focusroom.calculateEmployeesPerWorkplaceTypeUnadjusted() + quietzone.calculateEmployeesPerWorkplaceTypeUnadjusted() 
-      return addedPeakAreaSum * this.areaPerPersonExcludingCorridor() * this.variables.coworkingShare + this.addedPeakArea()
+      const sharedSmallMeetingroom = new SharedSmallMeetingroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const sharedMediumMeetingroom = new SharedMediumMeetingroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const areaPerPersonExcludingCorridorSum = sharedSmallMeetingroom.areaPerPersonExcludingCorridor() + sharedMediumMeetingroom.areaPerPersonExcludingCorridor() + this.areaPerPersonExcludingCorridor()
+      return this.variables.largeMeetingroomShare * addedPeakAreaSum * areaPerPersonExcludingCorridorSum * this.variables.coworkingShare + this.addedPeakArea()
     }
     return 0
   }

src/calculations/spaces/shared area/meetingroom_medium.ts

@@ -5,6 +5,8 @@ import Landscape from '../work related area/landscape'
 import Projectroom from '../work related area/projectroom'
 import Focusroom from '../work related area/focusroom'
 import Quietzone from '../work related area/quietzone'
+import SharedSmallMeetingroom from './meetingroom_small'
+import SharedLargeMeetingroom from './meetingroom_large'
 
 export default class SharedMediumMeetingroom extends MainSpace {
   /**
@@ -21,14 +23,17 @@ export default class SharedMediumMeetingroom extends MainSpace {
    */
   calculateAreaExclCompensation = (): number => {
     if (this.variables.accessToCoworking) {
-      const workDockin = new WorkDockin(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const cellOffice = new CellOffice(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const landscape = new Landscape(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const projectroom = new Projectroom(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const focusroom = new Focusroom(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const quietzone = new Quietzone(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const landscape = new Landscape(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const projectroom = new Projectroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const focusroom = new Focusroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const quietzone = new Quietzone(this.variables, this.config, this.customSpaceConstants, this.customConstants)
       const addedPeakAreaSum = workDockin.calculateEmployeesPerWorkplaceTypeUnadjusted() + cellOffice.calculateEmployeesPerWorkplaceTypeUnadjusted() + landscape.calculateEmployeesPerWorkplaceTypeUnadjusted() + projectroom.calculateEmployeesPerWorkplaceTypeUnadjusted() + focusroom.calculateEmployeesPerWorkplaceTypeUnadjusted() + quietzone.calculateEmployeesPerWorkplaceTypeUnadjusted() 
-      return addedPeakAreaSum * this.areaPerPersonExcludingCorridor() * this.variables.coworkingShare + this.addedPeakArea()
+      const sharedSmallMeetingroom = new SharedSmallMeetingroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const sharedLargeMeetingroom = new SharedLargeMeetingroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const areaPerPersonExcludingCorridorSum = sharedSmallMeetingroom.areaPerPersonExcludingCorridor() + sharedLargeMeetingroom.areaPerPersonExcludingCorridor() + this.areaPerPersonExcludingCorridor()
+      return this.variables.mediumMeetingroomShare * addedPeakAreaSum * areaPerPersonExcludingCorridorSum * this.variables.coworkingShare + this.addedPeakArea()
     }
     return 0
   }

src/calculations/spaces/shared area/meetingroom_small.ts

@@ -5,6 +5,8 @@ import Landscape from '../work related area/landscape'
 import Projectroom from '../work related area/projectroom'
 import Focusroom from '../work related area/focusroom'
 import Quietzone from '../work related area/quietzone'
+import SharedMediumMeetingroom from './meetingroom_medium'
+import SharedLargeMeetingroom from './meetingroom_large'
 
 export default class SharedSmallMeetingroom extends MainSpace {
   /**
@@ -21,14 +23,17 @@ export default class SharedSmallMeetingroom extends MainSpace {
    */
   calculateAreaExclCompensation = (): number => {
     if (this.variables.accessToCoworking) {
-      const workDockin = new WorkDockin(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const cellOffice = new CellOffice(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const landscape = new Landscape(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const projectroom = new Projectroom(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const focusroom = new Focusroom(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const quietzone = new Quietzone(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const landscape = new Landscape(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const projectroom = new Projectroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const focusroom = new Focusroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const quietzone = new Quietzone(this.variables, this.config, this.customSpaceConstants, this.customConstants)
       const addedPeakAreaSum = workDockin.calculateEmployeesPerWorkplaceTypeUnadjusted() + cellOffice.calculateEmployeesPerWorkplaceTypeUnadjusted() + landscape.calculateEmployeesPerWorkplaceTypeUnadjusted() + projectroom.calculateEmployeesPerWorkplaceTypeUnadjusted() + focusroom.calculateEmployeesPerWorkplaceTypeUnadjusted() + quietzone.calculateEmployeesPerWorkplaceTypeUnadjusted() 
-      return addedPeakAreaSum * this.areaPerPersonExcludingCorridor() * this.variables.coworkingShare + this.addedPeakArea()
+      const sharedMediumMeetingroom = new SharedMediumMeetingroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const sharedLargeMeetingroom = new SharedLargeMeetingroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const areaPerPersonExcludingCorridorSum = sharedMediumMeetingroom.areaPerPersonExcludingCorridor() + sharedLargeMeetingroom.areaPerPersonExcludingCorridor() + this.areaPerPersonExcludingCorridor()
+      return this.variables.smallMeetingroomShare * addedPeakAreaSum * areaPerPersonExcludingCorridorSum * this.variables.coworkingShare + this.addedPeakArea()
     }
     return 0
   }

src/calculations/spaces/shared area/multiroom.ts

@@ -14,12 +14,12 @@ export default class SharedMultiroom extends MainSpace {
   calculateAreaExclCompensation = (): number => {
     if (this.variables.accessToCoworking) {
       //=SUM((AP4:AP10)*AR26*AQ26)+(AB26)
-      const workDockin = new WorkDockin(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const cellOffice = new CellOffice(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const landscape = new Landscape(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const projectroom = new Projectroom(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const focusroom = new Focusroom(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
-      const quietzone = new Quietzone(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const landscape = new Landscape(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const projectroom = new Projectroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const focusroom = new Focusroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
+      const quietzone = new Quietzone(this.variables, this.config, this.customSpaceConstants, this.customConstants)
       const addedPeakAreaSum = workDockin.calculateEmployeesPerWorkplaceTypeUnadjusted() + cellOffice.calculateEmployeesPerWorkplaceTypeUnadjusted() + landscape.calculateEmployeesPerWorkplaceTypeUnadjusted() + projectroom.calculateEmployeesPerWorkplaceTypeUnadjusted() + focusroom.calculateEmployeesPerWorkplaceTypeUnadjusted() + quietzone.calculateEmployeesPerWorkplaceTypeUnadjusted() 
       return addedPeakAreaSum * this.areaPerPersonExcludingCorridor() * this.sharePerWorkspaceType() + this.addedPeakArea()
     }

src/calculations/spaces/work related area/dockin.ts

@@ -8,7 +8,7 @@ export default class WorkDockin extends MainSpace {
    */
   sharePerWorkspaceType = (): number => {
     // We need the shared dock in share for the calculation of the work dock in share
-    const sharedDockin = new SharedDockin(this.space, this.variables, this.config, this.customSpaceConstants, this.customConstants)
+    const sharedDockin = new SharedDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     return this.variables.dockinShare - sharedDockin.sharePerWorkspaceType()
   }