added string enums to solution

Author: masters3d

exercises/two-bucket/two-bucket.example.ts

@@ -1,12 +1,18 @@
-export default class TwoBucket {
-    starter: string
+
+export enum Bucket {
+  One = "one",
+  Two = "two"
+}
+
+export class TwoBucket {
+    starter: Bucket
     x: number
     y: number
     z: number
-    goalBucket: string
+    goalBucket: Bucket
     otherBucket: number
 
-    constructor(x: number, y: number, z: number, starter: string) {
+    constructor(x: number, y: number, z: number, starter: Bucket) {
       this.starter = starter
       this.x = x
       this.y = y
@@ -15,10 +21,10 @@ export default class TwoBucket {
     reachedGoal(measurements: number[]): boolean {
       if (measurements[0] === this.z || measurements[1] === this.z) {
         if (measurements[0] === this.z) {
-          this.goalBucket = 'one'
+          this.goalBucket = Bucket.One
           this.otherBucket = measurements[1]
         } else {
-          this.goalBucket = 'two'
+          this.goalBucket = Bucket.Two
           this.otherBucket = measurements[0]
         }
         return true
@@ -77,11 +83,11 @@ export default class TwoBucket {
     moves() {
       let j = 0,
         k = 0 // j will be running val of bucket one, k = running val of bucket two
-      this.starter === 'one' ? j = this.x : k = this.y
+      this.starter === Bucket.One ? j = this.x : k = this.y
       const measurements = [j, k]
       let moveCount = 0
       const prBool = true // pour / receive boolean - need to pour or receive every other turn
-      if (this.starter === 'one') {
+      if (this.starter === Bucket.One) {
         moveCount = this.smallFirst(measurements, moveCount, prBool)
       } else {
         moveCount = this.bigFirst(measurements, moveCount, prBool)

exercises/two-bucket/two-bucket.test.ts

@@ -1,4 +1,4 @@
-import TwoBucket from './two-bucket';
+import {TwoBucket, Bucket} from './two-bucket'
 
 describe('TwoBucket', () => {
   describe('works for input of 3, 5, 1', () => {
@@ -7,15 +7,15 @@ describe('TwoBucket', () => {
     const goal = 1
 
     test('starting with bucket one', () => {
-      const starterBuck = 'one'; // indicates which bucket to fill first
+      const starterBuck = Bucket.One // indicates which bucket to fill first
       const twoBucket = new TwoBucket(buckOne, buckTwo, goal, starterBuck)
       expect(twoBucket.moves()).toEqual(4) // includes the first fill
       expect(twoBucket.goalBucket).toEqual('one') // which bucket should end up with the desired # of liters
       expect(twoBucket.otherBucket).toEqual(5) // leftover value in the "other" bucket once the goal has been reached
-    });
+    })
 
     xtest('starting with bucket two', () => {
-      const starterBuck = 'two'
+      const starterBuck = Bucket.Two
       const twoBucket = new TwoBucket(buckOne, buckTwo, goal, starterBuck)
       expect(twoBucket.moves()).toEqual(8)
       expect(twoBucket.goalBucket).toEqual('two')
@@ -29,15 +29,15 @@ describe('TwoBucket', () => {
     const goal = 2
 
     xtest('starting with bucket one', () => {
-      const starterBuck = 'one'
+      const starterBuck = Bucket.One
       const twoBucket = new TwoBucket(buckOne, buckTwo, goal, starterBuck)
       expect(twoBucket.moves()).toEqual(14)
       expect(twoBucket.goalBucket).toEqual('one')
       expect(twoBucket.otherBucket).toEqual(11)
     })
 
     xtest('starting with bucket two', () => {
-      const starterBuck = 'two'
+      const starterBuck = Bucket.Two
       const twoBucket = new TwoBucket(buckOne, buckTwo, goal, starterBuck)
       expect(twoBucket.moves()).toEqual(18)
       expect(twoBucket.goalBucket).toEqual('two')