refactor: move gameTime and sampleSize to settings

SteveVanOpstal · May 31, 2016 · 6921882 · 6921882
1 parent ebe93e8
commit 6921882
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/config/settings.d.ts b/config/settings.d.ts
@@ -8,4 +8,6 @@ export declare module settings {
     match: string,
     'static-data': string,
   }
+  let gameTime: number;
+  let sampleSize: number;
 }
diff --git a/config/settings.js b/config/settings.js
@@ -24,5 +24,7 @@ module.exports.settings = helpers.merge(settings, {
     'matchlist': 'v2.2',
     'match': 'v2.2',
     'static-data': 'v1.2',
-  }
+  },
+  sampleSize: 64,
+  gameTime: 3600000
 });
diff --git a/src/app/build/config.ts b/src/app/build/config.ts
@@ -1,7 +1,4 @@
 export class Config {
-  public sampleSize: number = 24;
-  public gameTime: number = 3600000;
-
   public xp: Array<number> = [];
   public g: Array<number> = [];
 

diff --git a/src/app/build/graph.component.ts b/src/app/build/graph.component.ts
@@ -2,6 +2,7 @@ import {Component, ChangeDetectionStrategy, OnChanges, OnInit, SimpleChange, Inp
 import * as d3 from 'd3';
 
 import {Config} from './config';
+import {settings} from '../../../config/settings';
 
 import {DDragonDirective} from '../misc/ddragon.directive';
 
@@ -52,7 +53,7 @@ export class GraphComponent implements OnChanges, OnInit {
   private line: any = d3.svg.line()
     .interpolate('monotone')
     .x((d, i) => {
-      return this.xScaleTime(i * (this.config.gameTime / (this.config.sampleSize - 1)));
+      return this.xScaleTime(i * (settings.gameTime / (settings.sampleSize - 1)));
     })
     .y((d) => { return this.yScale(d); });
 
@@ -69,7 +70,7 @@ export class GraphComponent implements OnChanges, OnInit {
 
   createAxes() {
     this.xScaleTime = d3.scale.linear()
-      .domain([0, this.config.gameTime])
+      .domain([0, settings.gameTime])
       .range([0, this.graphWidth]);
 
     this.yScale = d3.scale.linear()

diff --git a/src/app/build/items/item-slot.component.ts b/src/app/build/items/item-slot.component.ts
@@ -5,6 +5,7 @@ import {Observable} from 'rxjs/Observable';
 import {ItemComponent} from './item.component';
 import {Item} from '../../misc/item';
 import {Config} from '../config';
+import {settings} from '../../../../config/settings';
 
 import * as d3 from 'd3'; // TODO: remove test
 
@@ -53,7 +54,7 @@ export class ItemSlotComponent {
   }
 
   private addTime(item: Item) {
-    item.time = this.getTime(this.config.g, item.gold.total, this.config.gameTime, this.config.sampleSize);
+    item.time = this.getTime(this.config.g, item.gold.total, settings.gameTime, settings.sampleSize);
   }
 
   private addBundle(item: Item) {

diff --git a/src/app/routes/build.component.ts b/src/app/routes/build.component.ts
@@ -13,6 +13,7 @@ import {ErrorComponent} from '../misc/error.component';
 import {LolApiService} from '../misc/lolapi.service';
 
 import {Config} from '../build/config';
+import {settings} from '../../../config/settings';
 
 @Component({
   providers: [LolApiService],
@@ -64,7 +65,7 @@ export class BuildComponent {
   }
 
   getMatchData(value: string) {
-    this.lolApi.getMatchData(value, this.championKey, this.config.gameTime, this.config.sampleSize)
+    this.lolApi.getMatchData(value, this.championKey, settings.gameTime, settings.sampleSize)
       .subscribe(
         res => {
           this.config = new Config();