Changed expression calc and stretch assignment

Author: Wayleom Vargas Rubio

lesson_06/expression/src/abbre-stretch-wayvar.ts

@@ -1,14 +1,30 @@
 function isValidAlphaAbbreviation(word: string, abbr: string): boolean {
-    let wordlength = word.length;
-    let abbrlength = abbr.length;
 
-    if (wordlength < abbrlength) return false;
     if (word.length < 1 || word.length > 25) return false;
     if (abbr.length < 1 || abbr.length > 15) return false;
     if (!/^[a-z]+$/.test(word)) return false;
     if (!/^[a-z]+$/.test(abbr)) return false;
+    if (abbr.length > word.length) return false;
 
-    
+    let built = "";
+    let i = 0;
 
-    return true;
-}
+    while (i < word.length) {
+        const ch = word[i];
+
+        built += ch;
+        i++;
+
+        if (i < word.length) {
+        const skip = ch.charCodeAt(0) - 96;
+        i += skip; 
+        }
+    }
+
+return built === abbr;
+}
+console.log(isValidAlphaAbbreviation("abbreviation", "acefn")); // true
+console.log(isValidAlphaAbbreviation("abbreviation", "acehn")); // false
+console.log(isValidAlphaAbbreviation("abbreviation", "acgn")); // false
+console.log(isValidAlphaAbbreviation("internationalization", "imzdn")); // true
+console.log(isValidAlphaAbbreviation("internationalization", "inz")); // false

lesson_06/expression/src/expression_calculator.ts

@@ -3,10 +3,22 @@ export class ExpressionCalculator {
   calculate(a: number, b: number, c: number, d: number, e: number): number {
     // Implement your code here to return the correct value.
     // Function to implement: Math.pow((a + b) / c, d) * e
-    return Math.pow((a + b) / c, d) * e;
+    return this.multiply(this.pow(this.divide(this.add(a, b), c), d), e);
   }
 
   pow(base: number, exponent: number): number {
     return Math.pow(base, exponent);
   }
+  add(a: number, b: number): number {
+    return a + b;
+  }
+  multiply(a: number, b: number): number {
+    return a * b;
+  }
+  divide(a: number, b: number): number {
+    return a / b;
+  }
+  subtract(a: number, b: number): number {
+    return a - b;
+  }
 }