remove .reduce functions. fix lint errors (#7)

tensorflow · Aug 31, 2018 · eb73515 · eb73515
1 parent 55e2126
commit eb73515
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 49 deletions.
diff --git a/demos/mnist/tufte.css b/demos/mnist/tufte.css
@@ -1,32 +1,5 @@
 @charset "UTF-8";
 
-/* Import ET Book styles
-   adapted from https://github.com/edwardtufte/et-book/blob/gh-pages/et-book.css */
-
-@font-face { font-family: "et-book";
-             src: url("et-book/et-book-roman-line-figures/et-book-roman-line-figures.eot");
-             src: url("et-book/et-book-roman-line-figures/et-book-roman-line-figures.eot?#iefix") format("embedded-opentype"), url("et-book/et-book-roman-line-figures/et-book-roman-line-figures.woff") format("woff"), url("et-book/et-book-roman-line-figures/et-book-roman-line-figures.ttf") format("truetype"), url("et-book/et-book-roman-line-figures/et-book-roman-line-figures.svg#etbookromanosf") format("svg");
-             font-weight: normal;
-             font-style: normal; }
-
-@font-face { font-family: "et-book";
-             src: url("et-book/et-book-display-italic-old-style-figures/et-book-display-italic-old-style-figures.eot");
-             src: url("et-book/et-book-display-italic-old-style-figures/et-book-display-italic-old-style-figures.eot?#iefix") format("embedded-opentype"), url("et-book/et-book-display-italic-old-style-figures/et-book-display-italic-old-style-figures.woff") format("woff"), url("et-book/et-book-display-italic-old-style-figures/et-book-display-italic-old-style-figures.ttf") format("truetype"), url("et-book/et-book-display-italic-old-style-figures/et-book-display-italic-old-style-figures.svg#etbookromanosf") format("svg");
-             font-weight: normal;
-             font-style: italic; }
-
-@font-face { font-family: "et-book";
-             src: url("et-book/et-book-bold-line-figures/et-book-bold-line-figures.eot");
-             src: url("et-book/et-book-bold-line-figures/et-book-bold-line-figures.eot?#iefix") format("embedded-opentype"), url("et-book/et-book-bold-line-figures/et-book-bold-line-figures.woff") format("woff"), url("et-book/et-book-bold-line-figures/et-book-bold-line-figures.ttf") format("truetype"), url("et-book/et-book-bold-line-figures/et-book-bold-line-figures.svg#etbookromanosf") format("svg");
-             font-weight: bold;
-             font-style: normal; }
-
-@font-face { font-family: "et-book-roman-old-style";
-             src: url("et-book/et-book-roman-old-style-figures/et-book-roman-old-style-figures.eot");
-             src: url("et-book/et-book-roman-old-style-figures/et-book-roman-old-style-figures.eot?#iefix") format("embedded-opentype"), url("et-book/et-book-roman-old-style-figures/et-book-roman-old-style-figures.woff") format("woff"), url("et-book/et-book-roman-old-style-figures/et-book-roman-old-style-figures.ttf") format("truetype"), url("et-book/et-book-roman-old-style-figures/et-book-roman-old-style-figures.svg#etbookromanosf") format("svg");
-             font-weight: normal;
-             font-style: normal; }
-
 /* Tufte CSS styles */
 html { font-size: 15px; }
 

diff --git a/package.json b/package.json
@@ -5,9 +5,9 @@
   "license": "Apache-2.0",
   "private": true,
   "scripts": {
-    "build": "tsc && NODE_ENV=production webpack",
+    "build": "yarn lint && tsc && NODE_ENV=production webpack",
     "lint": "tslint -p . -t verbose",
-    "test": "karma start"
+    "test": "yarn lint && karma start"
   },
   "dependencies": {
     "d3-format": "^1.3.0",

diff --git a/src/render/confusion_matrix_test.ts b/src/render/confusion_matrix_test.ts
@@ -38,7 +38,7 @@ describe('renderConfusionMatrix', () => {
     const data = {
       values: [[4, 2, 8], [1, 7, 2], [3, 3, 20]],
       labels: ['cheese', 'pig', 'font'],
-    }
+    };
 
     const container = document.getElementById('container') as HTMLElement;
     await renderConfusionMatrix(data, container, {shadeDiagonal: true});
@@ -61,7 +61,7 @@ describe('renderConfusionMatrix', () => {
     let data = {
       values: [[4, 2, 8], [1, 7, 2], [3, 3, 20]],
       labels: ['cheese', 'pig', 'font'],
-    }
+    };
 
     const container = document.getElementById('container') as HTMLElement;
 
@@ -71,7 +71,7 @@ describe('renderConfusionMatrix', () => {
     data = {
       values: [[43, 2, 8], [1, 7, 2], [3, 3, 20]],
       labels: ['cheese', 'pig', 'font'],
-    }
+    };
 
     await renderConfusionMatrix(data, container);
     expect(document.querySelectorAll('.vega-embed').length).toBe(1);

diff --git a/src/render/linechart.ts b/src/render/linechart.ts
@@ -36,13 +36,14 @@ export async function renderLinechart(
   inputArray = Array.isArray(inputArray[0]) ? inputArray as Point2D[][] :
                                               [inputArray] as Point2D[][];
 
-  const values = inputArray.reduce((memo, seriesData, i) => {
+  const values: Point2D[] = [];
+  inputArray.forEach((seriesData, i) => {
     const seriesName: string =
         _series[i] != null ? _series[i] : `Series ${i + 1}`;
     const seriesVals =
         seriesData.map(v => Object.assign({}, v, {series: seriesName}));
-    return memo.concat(seriesVals);
-  }, []);
+    values.push(...seriesVals);
+  });
 
   const drawArea = getDrawArea(container);
   const options = Object.assign({}, defaultOpts, opts);

diff --git a/src/render/scatterplot.ts b/src/render/scatterplot.ts
@@ -36,13 +36,14 @@ export async function renderScatterplot(
   _values = Array.isArray(_values[0]) ? _values as Point2D[][] :
                                         [_values] as Point2D[][];
 
-  const values = _values.reduce((memo, seriesData, i) => {
+  const values: Point2D[] = [];
+  _values.forEach((seriesData, i) => {
     const seriesName: string =
         _series[i] != null ? _series[i] : `Series ${i + 1}`;
     const seriesVals =
         seriesData.map(v => Object.assign({}, v, {series: seriesName}));
-    return memo.concat(seriesVals);
-  }, []);
+    values.push(...seriesVals);
+  });
 
   const drawArea = getDrawArea(container);
   const options = Object.assign({}, defaultOpts, opts);

diff --git a/src/show/history.ts b/src/show/history.ts
@@ -27,12 +27,13 @@ export async function history(
   let values: Point2D[][];
   if (Array.isArray(history)) {
     values = metrics.map(metric => {
-      return history.reduce((points: Point2D[], log: Logs, x: number) => {
+      const points: Point2D[] = [];
+      history.forEach((log: Logs, x: number) => {
         if (log[metric] != null) {
           points.push({x, y: log[metric]});
         }
-        return points;
-      }, []);
+      });
+      return points;
     });
   } else {
     values = metrics.map(metric => {
@@ -90,12 +91,11 @@ export function fitCallbacks(
     };
   }
 
-  return callbackNames.reduce(
-      (callbacks: FitCallbackHandlers, name: string) => {
-        callbacks[name] = makeCallbackFor(name);
-        return callbacks;
-      },
-      {});
+  const callbacks: FitCallbackHandlers = {};
+  callbackNames.forEach((name: string) => {
+    callbacks[name] = makeCallbackFor(name);
+  });
+  return callbacks;
 }
 
 type HistoryLike = Logs[]|{

diff --git a/src/types.ts b/src/types.ts
@@ -153,7 +153,6 @@ export function isSurface(drawable: Drawable): drawable is Surface {
   return false;
 }
 
-
 /**
  * Common visualisation options for '.render' functions.
  */

diff --git a/tslint.json b/tslint.json
@@ -33,7 +33,14 @@
       ],
       [
         "xitFakeAsync"
-      ]
+      ],
+      {
+        "name": [
+          "*",
+          "reduce"
+        ],
+        "message": "Use forEach or a regular for loop instead."
+      }
     ],
     "ban-types": [
       true,