From 86dc00923187ae34d9384f7d6abc81658cefb250 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Tue, 5 Jun 2018 13:42:45 +0300 Subject: [PATCH] Rename Movements to Journal --- source/Daemon.js | 4 ++-- source/{Movements.js => Journal.js} | 2 +- source/Predictor.js | 4 ++-- tests/DaemonTest.js | 6 +++--- tests/{MovementsTest.js => JourlanTest.js} | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) rename source/{Movements.js => Journal.js} (93%) rename tests/{MovementsTest.js => JourlanTest.js} (76%) diff --git a/source/Daemon.js b/source/Daemon.js index a8aa2f9..8dd53a9 100644 --- a/source/Daemon.js +++ b/source/Daemon.js @@ -16,8 +16,8 @@ export default class Daemon { this.epsilon = epsilon; } - predict(movements) { - const steps = this._getStepSlice(movements); + predict(journal) { + const steps = this._getStepSlice(journal); const w0 = this._getWeight([...steps, 0]); const w1 = this._getWeight([...steps, 1]); diff --git a/source/Movements.js b/source/Journal.js similarity index 93% rename from source/Movements.js rename to source/Journal.js index 29bb22a..c0af542 100644 --- a/source/Movements.js +++ b/source/Journal.js @@ -1,6 +1,6 @@ import Move from './Move'; -export default class Movements { +export default class Journal { moves = []; constructor(moves = []) { diff --git a/source/Predictor.js b/source/Predictor.js index 9dd6e7f..96ab941 100644 --- a/source/Predictor.js +++ b/source/Predictor.js @@ -1,4 +1,4 @@ -import Movements from './Movements'; +import History from './Journal'; import Supervisor from './Supervisor'; export default class Predictor { @@ -7,7 +7,7 @@ export default class Predictor { score = 0; constructor() { - this.movements = new Movements(); + this.movements = new History(); this.supervisor = new Supervisor(); } } diff --git a/tests/DaemonTest.js b/tests/DaemonTest.js index 1e95e62..d189fbf 100644 --- a/tests/DaemonTest.js +++ b/tests/DaemonTest.js @@ -1,15 +1,15 @@ import Daemon from '../source/Daemon'; import expect from 'expect'; -import Movements from '../source/Movements'; +import History from '../source/Journal'; test('Get prediction for beginning', function() { - const m = new Movements(); + const m = new History(); const d = new Daemon(1, 1); expect(d.predict(m)).toEqual(0); }); test('Daemon 1-1', function() { - const m = new Movements(); + const m = new History(); const d = new Daemon(1, 1); const step_slice = s => { diff --git a/tests/MovementsTest.js b/tests/JourlanTest.js similarity index 76% rename from tests/MovementsTest.js rename to tests/JourlanTest.js index 6499a76..e0affc6 100644 --- a/tests/MovementsTest.js +++ b/tests/JourlanTest.js @@ -1,25 +1,25 @@ -import Movements from '../source/Movements'; +import Journal from '../source/Journal'; import Move from '../source/Move'; import expect from 'expect'; test('Create with empty constructor', function() { - const m = new Movements(); + const m = new Journal(); expect(m.getLastMovements(5, 5)).toEqual([]); }); test('Constructor with human steps', function() { - const m = new Movements([new Move(1, 1)]); + const m = new Journal([new Move(1, 1)]); expect(m.getLastMovements(5, 5)).toEqual([1, 1]); }); test('Make steps', function() { - const m = new Movements(); + const m = new Journal(); m.makeMove(1, 0); expect(m.getLastMovements(5, 5)).toEqual([0, 1]); }); test('Get slice', function() { - const m = new Movements([ + const m = new Journal([ new Move(1, 1), new Move(0, 1), new Move(0, 1),