Merge remote-tracking branch 'AB/master'

add A new solution for a new condition
AV-Shell · Nov 1, 2020 · a7bcb76 · a7bcb76
2 parents 9c49ef4 + bdd0828
commit a7bcb76
Show file tree

Hide file tree

Showing 18 changed files with 1,197 additions and 528 deletions.
diff --git a/README.md b/README.md
diff --git a/README_RU.md b/README_RU.md
diff --git a/extensions/custom-error.js b/extensions/custom-error.js
@@ -0,0 +1,8 @@
+const CustomError = class CustomError extends Error {
+    constructor(message) {
+        super(message);
+        this._validationProp = 'NA';
+    }
+};
+
+module.exports = CustomError;
diff --git a/extensions/it-optional.js b/extensions/it-optional.js
@@ -1,15 +1,13 @@
-// code from https://github.com/mikhama/core-js-101
+// code is based on solution from https://github.com/mikhama/core-js-101
 function testOptional(title, fn, isAsyncTest) {
     if (isAsyncTest) {
       it(title, function test(done) {
         try {
           fn.call(this, done);
         } catch (err) {
-          if (err === 'Not implemented') {
-            console.log('NOT IMPLEMENTED' + title);
+          if (err._validationProp === 'NA') {
             this.test.skip();
           } else {
-            console.log('ERR UP' + title);
             throw err;
           }
         }
@@ -19,7 +17,7 @@ function testOptional(title, fn, isAsyncTest) {
         try {
           fn.call(this);
         } catch (err) {
-          if (err === 'Not implemented') {
+          if (err._validationProp === 'NA') {
             this.test.skip();
           } else {
             throw err;

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/dream-team.js b/src/dream-team.js
@@ -1,27 +1,27 @@
 const CONSOLE_LOG_ENABLE = false;
 
 module.exports = function createDreamTeam(members_array/* members */) {
-  if  (!(Array.isArray(members_array))){
-     if (CONSOLE_LOG_ENABLE) console.log ((Array.isArray(members_array)));
+  if (!(Array.isArray(members_array))) {
+    if (CONSOLE_LOG_ENABLE) console.log((Array.isArray(members_array)));
     return false;
   }
 
   let team = '';
 
-  for (let i = 0; i<members_array.length; i++) {
-    if  (typeof( members_array[i] ) === "string"){
-      team +=  members_array[i].match(/\w/);
+  for (let i = 0; i < members_array.length; i++) {
+    if (typeof (members_array[i]) === "string") {
+      team += members_array[i].match(/\w/);
     }
   }
 
-   if (CONSOLE_LOG_ENABLE) console.log(team);
+  if (CONSOLE_LOG_ENABLE) console.log(team);
   team = team.toUpperCase().split("").sort().join("");
-   if (CONSOLE_LOG_ENABLE) console.log(team);
+  if (CONSOLE_LOG_ENABLE) console.log(team);
 
   if (team === "") {
     return false;
   }
   return team;
   // throw 'Not implemented';
   // // remove line with error and write your code here
-};
+};
diff --git a/src/extended-repeater.js b/src/extended-repeater.js
@@ -26,6 +26,5 @@ module.exports = function repeater(str, options) {
         outstring = outstring + str + add_str;
     } while (i < repeatTimes);
     return outstring;
-    throw 'Not implemented';
     // remove line with error and write your code here
 };
diff --git a/src/hanoi-tower.js b/src/hanoi-tower.js
@@ -7,6 +7,8 @@ module.exports = function calculateHanoi( disksNumber, turnsSpeed ) {
     for(let i=1; i<=disksNumber;i++){
         obj.turns = obj.turns*2 +1;
     }
-    obj.seconds = obj.turns/ (turnsSpeed/ 3600);
+    // console.log('myseconds',obj.turns * 3600 / turnsSpeed);
+    obj.seconds = Math.floor(obj.turns * 3600 / turnsSpeed);
+    // console.log('myseconds',obj.seconds);
     return obj;
-}
+}
diff --git a/src/recursive-depth.js b/src/recursive-depth.js
@@ -1,3 +1,5 @@
+const CustomError = require("../extensions/custom-error");
+
 module.exports = class DepthCalculator {
     calculateDepth(arr) {
         // console.log (arr)

diff --git a/src/transform-array.js b/src/transform-array.js
@@ -13,7 +13,7 @@ module.exports = function transform(inc_arr) {
     }
     if (SHOW_CONSOLE_LOG) console.log('start program');
     if (SHOW_CONSOLE_LOG) console.log('array length', inc_arr.length, 'array:', inc_arr);
-
+    /* Я так понимаю задачу упростили, плак плак плак плак ...
 
     for (let i = 0; i < inc_arr.length; i++) {
         if (inc_arr[i] in CONTROLS) {
@@ -61,11 +61,51 @@ module.exports = function transform(inc_arr) {
             }
         }
     }
-
-
-
     if (SHOW_CONSOLE_LOG) console.log('array length', inc_arr.length, 'array:', inc_arr);
     if (SHOW_CONSOLE_LOG) console.log('end program');
-    return inc_arr;
+    */
+
+    let myArr = inc_arr.slice();
+    for (let i = 0; i < myArr.length; i++) {
+        if (myArr[i] in CONTROLS) {
+            switch (myArr[i]) {
+                case '--double-prev':
+                    if (i > 0) {
+                        myArr[i] = myArr[i-1];
+                    } else {
+                        myArr[i] = null;
+                    }
+                    break;
+                case '--double-next':
+                    if ((i+1) < inc_arr.length) {
+                        myArr[i] = myArr[i+1];
+                    } else {
+                        myArr[i] = null;
+                    }
+                    break;
+                case '--discard-prev':
+                    if (i > 0) {
+                        myArr[i] = null;
+                        myArr[i-1] = null;
+                    } else {
+                        myArr[i] = null;
+                    }
+                    break;
+                case '--discard-next':
+                    if (i < (inc_arr.length - 1)) {
+                        myArr[i] = null;
+                        myArr[i+1] = null;
+                    } else {
+                        myArr[i] = null;
+                    }
+                    i++;
+                    break;
+            }
+        } 
+    }
+    myArr = myArr.filter((el) => el !== null);
+    if (SHOW_CONSOLE_LOG) console.log('array length', myArr.length, 'array:', myArr);
+    if (SHOW_CONSOLE_LOG) console.log('end program');
+    return myArr;
     // remove line with error and write your code here
 };