From 74eb4cca864bb4a75d5261bf84a131c87db818f4 Mon Sep 17 00:00:00 2001
From: s2224834 <46319860+s2224834@users.noreply.github.com>
Date: Sat, 12 Jan 2019 01:35:24 +0000
Subject: [PATCH] Bombe: tweaks

Twiddle the default rotor sets a bit.
Add a time remaining estimate for the multibombe.
---
 src/core/lib/Enigma.mjs               |  8 ++++----
 src/core/operations/Bombe.mjs         |  4 ++--
 src/core/operations/Enigma.mjs        |  6 +++---
 src/core/operations/MultipleBombe.mjs | 18 ++++++++++++------
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/core/lib/Enigma.mjs b/src/core/lib/Enigma.mjs
index 6b6c4d63..1ed0ea2b 100644
--- a/src/core/lib/Enigma.mjs
+++ b/src/core/lib/Enigma.mjs
@@ -22,14 +22,14 @@ export const ROTORS = [
     {name: "VI", value: "JPGVOUMFYQBENHZRDKASXLICTW<AN"},
     {name: "VII", value: "NZJHGRCXMYSWBOUFAIVLPEKQDT<AN"},
     {name: "VIII", value: "FKQHTLXOCBJSPDZRAMEWNIUYGV<AN"},
+];
+
+export const ROTORS_FOURTH = [
+    {name: "None", value: ""},
     {name: "Beta", value: "LEYJVCNIXWPBQMDRTAKZGFUHOS"},
     {name: "Gamma", value: "FSOKANUERHMBTIYCWLQPZXVGJD"},
 ];
 
-export const ROTORS_OPTIONAL = [].concat(ROTORS).concat([
-    {name: "None", value: ""},
-]);
-
 /**
  * Provided default Enigma reflector set.
  * These are specified as 13 space-separated transposed pairs covering every letter.
diff --git a/src/core/operations/Bombe.mjs b/src/core/operations/Bombe.mjs
index 3c29cd8c..9014fd3a 100644
--- a/src/core/operations/Bombe.mjs
+++ b/src/core/operations/Bombe.mjs
@@ -9,7 +9,7 @@
 import Operation from "../Operation";
 import OperationError from "../errors/OperationError";
 import {BombeMachine} from "../lib/Bombe";
-import {ROTORS, ROTORS_OPTIONAL, REFLECTORS, Reflector} from "../lib/Enigma";
+import {ROTORS, ROTORS_FOURTH, REFLECTORS, Reflector} from "../lib/Enigma";
 
 /**
  * Bombe operation
@@ -49,7 +49,7 @@ class Bombe extends Operation {
             {
                 name: "4th (left-most, only some models) rotor",
                 type: "editableOption",
-                value: ROTORS_OPTIONAL,
+                value: ROTORS_FOURTH,
                 defaultIndex: 10
             },
             {
diff --git a/src/core/operations/Enigma.mjs b/src/core/operations/Enigma.mjs
index 72adba14..4af79993 100644
--- a/src/core/operations/Enigma.mjs
+++ b/src/core/operations/Enigma.mjs
@@ -8,7 +8,7 @@
 
 import Operation from "../Operation";
 import OperationError from "../errors/OperationError";
-import {ROTORS, LETTERS, ROTORS_OPTIONAL, REFLECTORS, Rotor, Reflector, Plugboard, EnigmaMachine} from "../lib/Enigma";
+import {ROTORS, LETTERS, ROTORS_FOURTH, REFLECTORS, Rotor, Reflector, Plugboard, EnigmaMachine} from "../lib/Enigma";
 
 /**
  * Enigma operation
@@ -79,8 +79,8 @@ class Enigma extends Operation {
             {
                 name: "4th (left-most, only some models) rotor",
                 type: "editableOption",
-                value: ROTORS_OPTIONAL,
-                defaultIndex: 10
+                value: ROTORS_FOURTH,
+                defaultIndex: 0
             },
             {
                 name: "4th rotor ring setting",
diff --git a/src/core/operations/MultipleBombe.mjs b/src/core/operations/MultipleBombe.mjs
index 4b3123a4..dac7a334 100644
--- a/src/core/operations/MultipleBombe.mjs
+++ b/src/core/operations/MultipleBombe.mjs
@@ -10,7 +10,7 @@
 import Operation from "../Operation";
 import OperationError from "../errors/OperationError";
 import {BombeMachine} from "../lib/Bombe";
-import {ROTORS, REFLECTORS, Reflector} from "../lib/Enigma";
+import {ROTORS, ROTORS_FOURTH, REFLECTORS, Reflector} from "../lib/Enigma";
 
 /**
  * Convenience method for flattening the preset ROTORS object into a newline-separated string.
@@ -104,11 +104,11 @@ class MultipleBombe extends Operation {
                     },
                     {
                         name: "German Service Enigma (Third - 4 rotor)",
-                        value: rotorsFormat(ROTORS, 8, 9)
+                        value: rotorsFormat(ROTORS_FOURTH, 1, 2)
                     },
                     {
                         name: "German Service Enigma (Fourth - 4 rotor)",
-                        value: rotorsFormat(ROTORS, 8, 10)
+                        value: rotorsFormat(ROTORS_FOURTH, 1, 3)
                     },
                     {
                         name: "User defined",
@@ -178,8 +178,13 @@ class MultipleBombe extends Operation {
      * @param {number} nStops - How many stops so far
      * @param {number} progress - Progress (as a float in the range 0..1)
      */
-    updateStatus(nLoops, nStops, progress) {
-        const msg = `Bombe run with ${nLoops} loops in menu (2+ desirable): ${nStops} stops, ${Math.floor(100 * progress)}% done`;
+    updateStatus(nLoops, nStops, progress, start) {
+        const elapsed = new Date().getTime() - start;
+        const remaining = (elapsed / progress) * (1 - progress) / 1000;
+        const hours = Math.floor(remaining / 3600);
+        const minutes = `0${Math.floor((remaining % 3600) / 60)}`.slice(-2);
+        const seconds = `0${Math.floor(remaining % 60)}`.slice(-2);
+        const msg = `Bombe run with ${nLoops} loops in menu (2+ desirable): ${nStops} stops, ${Math.floor(100 * progress)}% done, ${hours}:${minutes}:${seconds} remaining`;
         self.sendStatusMessage(msg);
     }
 
@@ -267,6 +272,7 @@ class MultipleBombe extends Operation {
         const totalRuns = choose(rotors.length, 3) * 6 * fourthRotors.length * reflectors.length;
         let nRuns = 0;
         let nStops = 0;
+        const start = new Date().getTime();
         for (const rotor1 of rotors) {
             for (const rotor2 of rotors) {
                 if (rotor2 === rotor1) {
@@ -292,7 +298,7 @@ class MultipleBombe extends Operation {
                             const result = bombe.run();
                             nStops += result.length;
                             if (update !== undefined) {
-                                update(bombe.nLoops, nStops, nRuns / totalRuns);
+                                update(bombe.nLoops, nStops, nRuns / totalRuns, start);
                             }
                             if (result.length > 0) {
                                 msg += `\nRotors: ${runRotors.join(", ")}\nReflector: ${reflector.pairs}\n`;