Skip to content

Commit fd98b11

Browse files
committed
upgrade babel, drop semis, finish validation
1 parent 5032c2d commit fd98b11

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+808
-580
lines changed

.babelrc

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"presets": [
3+
"es2015",
4+
"stage-1"
5+
]
6+
}

.eslintrc

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
"defaults/rules/eslint/style/airbnb",
1010
"defaults/rules/eslint/variables/airbnb"
1111
],
12+
"parser": "babel-eslint",
1213
"rules": {
13-
"no-unused-vars": [2, {"vars": "all", "args": "none"}]
14+
"no-unused-vars": [2, {"vars": "all", "args": "none"}],
15+
"semi": [2, "never"]
1416
}
1517
}

.gitignore

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
_builds/
2-
_projects/
3-
_steps/
1+
# Heads Up!
2+
# Each line in this file is passed to `rm -rf` on `npm run clean`
3+
#
4+
45
CHANGELOG.md
56
coverage/
67
node_modules/
7-
npm-debug.log*
8+
*.log*
89
app/bower/
910
app/dist/
1011
dist/

.istanbul.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
instrumentation:
2-
excludes: [app, dist, docs, gulp, test]
2+
excludes: [app, dist, docs, gulp, test]
33
check:
4-
global:
5-
statements: 80
6-
lines: 80
7-
branches: 80
8-
functions: 80
4+
global:
5+
statements: 80
6+
lines: 80
7+
branches: 80
8+
functions: 80

app/src/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ angular.module('App', [
33

44
'App.vis',
55
'App.toolbar',
6-
]);
6+
])
+33-33
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
function AnnyFactory($rootScope) {
2-
var factory = {};
2+
var factory = {}
33

44
factory.init = function init() {
5-
factory.newNetwork([2, 1]);
6-
};
5+
factory.newNetwork([2, 1])
6+
}
77

88
factory.activate = function(inputs) {
9-
factory.network.activate(inputs);
10-
factory.emitChange();
11-
};
9+
factory.network.activate(inputs)
10+
factory.emitChange()
11+
}
1212

13-
factory.data = anny.DATA;
13+
factory.data = anny.DATA
1414

1515
factory.getRandomLayers = function getRandomLayers() {
16-
var inputs = 2;
17-
var outputs = 1;
18-
var numHiddenLayers = _.random(1, 3);
19-
var hiddenLayers = [];
16+
var inputs = 2
17+
var outputs = 1
18+
var numHiddenLayers = _.random(1, 3)
19+
var hiddenLayers = []
2020

2121
_.times(numHiddenLayers, function time() {
22-
hiddenLayers.push(_.random(3, 5));
23-
});
22+
hiddenLayers.push(_.random(3, 5))
23+
})
2424

25-
return [].concat(inputs, hiddenLayers, outputs);
26-
};
25+
return [].concat(inputs, hiddenLayers, outputs)
26+
}
2727

2828
factory.train = function(trainingSet, callback, frequency) {
29-
var results = ['Predictions after training:'];
30-
factory.network.train(trainingSet, callback, frequency);
29+
var results = ['Predictions after training:']
30+
factory.network.train(trainingSet, callback, frequency)
3131

3232
_.each(trainingSet, function(sample) {
33-
var input = sample.input;
34-
var output = factory.network.activate(input);
33+
var input = sample.input
34+
var output = factory.network.activate(input)
3535
results.push(
3636
'[' + input.toString() + '] == ' + (output >= 0.5) + ' ' + output
37-
);
38-
});
37+
)
38+
})
3939

40-
console.log(results.join('\n'));
40+
console.log(results.join('\n'))
4141

42-
factory.emitChange();
43-
};
42+
factory.emitChange()
43+
}
4444

4545
factory.newNetwork = function newNetwork(layers) {
46-
factory.network = new anny.Network(layers || factory.getRandomLayers());
47-
factory.emitChange();
48-
};
46+
factory.network = new anny.Network(layers || factory.getRandomLayers())
47+
factory.emitChange()
48+
}
4949

5050
factory.emitChange = function emitChange() {
51-
$rootScope.$broadcast('anny:changed');
52-
window.network = factory.network;
53-
};
51+
$rootScope.$broadcast('anny:changed')
52+
window.network = factory.network
53+
}
5454

55-
factory.init();
55+
factory.init()
5656

57-
return factory;
57+
return factory
5858
}
5959

6060
angular.module('anny')
61-
.factory('AnnyFactory', AnnyFactory);
61+
.factory('AnnyFactory', AnnyFactory)
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
angular.module('anny', []);
1+
angular.module('anny', [])

app/src/components/toolbar/toolbar-directive.js

+19-19
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@ angular.module('App.toolbar')
77
templateUrl: 'app/dist/components/toolbar/toolbar.html',
88
link: function(scope) {
99
scope.resetNet = function resetNet() {
10-
AnnyFactory.init();
11-
};
10+
AnnyFactory.init()
11+
}
1212

1313
scope.randomNet = function randomNet() {
14-
AnnyFactory.newNetwork();
15-
};
14+
AnnyFactory.newNetwork()
15+
}
1616

1717
scope.activateRandom = function activateRandom() {
18-
var inputs = [];
18+
var inputs = []
1919

2020
_.times(AnnyFactory.network.inputLayer.neurons.length, function() {
21-
inputs.push(_.random(-1, 1, true));
22-
});
21+
inputs.push(_.random(-1, 1, true))
22+
})
2323

24-
AnnyFactory.activate(inputs);
25-
};
24+
AnnyFactory.activate(inputs)
25+
}
2626

2727
scope.trainORGate = function trainORGate() {
28-
AnnyFactory.train(AnnyFactory.data.ORGate);
29-
};
28+
AnnyFactory.train(AnnyFactory.data.ORGate)
29+
}
3030

3131
scope.trainXORGate = function trainXORGate() {
32-
AnnyFactory.train(AnnyFactory.data.XORGate);
33-
};
32+
AnnyFactory.train(AnnyFactory.data.XORGate)
33+
}
3434

3535
scope.trainANDGate = function trainANDGate() {
36-
AnnyFactory.train(AnnyFactory.data.ANDGate);
37-
};
36+
AnnyFactory.train(AnnyFactory.data.ANDGate)
37+
}
3838

3939
scope.trainNANDGate = function trainNANDGate() {
40-
AnnyFactory.train(AnnyFactory.data.NANDGate);
41-
};
40+
AnnyFactory.train(AnnyFactory.data.NANDGate)
41+
}
4242
},
43-
};
44-
});
43+
}
44+
})
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
angular.module('App.toolbar', []);
1+
angular.module('App.toolbar', [])

app/src/components/vis/vis-module.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
angular.module('App.vis', []);
1+
angular.module('App.vis', [])

app/src/components/vis/vis-network-directive.js

+22-22
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ function visNetwork(visNetworkOptions, AnnyFactory, $rootScope) {
55
template: '<div class="vis-network"></div>',
66
link: function link(scope, elm) {
77
scope.getData = function getData() {
8-
var nodes = [];
9-
var edges = [];
8+
var nodes = []
9+
var edges = []
1010

1111
// layers
1212
_.each(AnnyFactory.network.allLayers, function(layer, layerIndex) {
1313
// neurons
1414
_.each(layer.neurons, function(neuron) {
15-
var id = neuron.id;
16-
var input = neuron.input.toFixed(3);
17-
var output = neuron.output.toFixed(3);
18-
var delta = neuron.delta.toFixed(6);
19-
var error = neuron.error.toFixed(3);
15+
var id = neuron.id
16+
var input = neuron.input.toFixed(3)
17+
var output = neuron.output.toFixed(3)
18+
var delta = neuron.delta.toFixed(6)
19+
var error = neuron.error.toFixed(3)
2020

2121
nodes.push({
2222
id: id,
@@ -40,11 +40,11 @@ function visNetwork(visNetworkOptions, AnnyFactory, $rootScope) {
4040
).join(' '),
4141
value: Math.abs(output),
4242
group: neuron.isBias ? 'bias' : 'normal',
43-
});
43+
})
4444

4545
// connections
4646
_.each(neuron.outgoing, function(connection) {
47-
var weight = connection.weight.toFixed(3);
47+
var weight = connection.weight.toFixed(3)
4848

4949
edges.push({
5050
from: connection.source.id,
@@ -60,32 +60,32 @@ function visNetwork(visNetworkOptions, AnnyFactory, $rootScope) {
6060
highlight: weight >= 0 ? 'hsl(210, 60%, 70%)' :
6161
'hsl(30, 60%, 60%)',
6262
},
63-
});
64-
});
65-
});
66-
});
63+
})
64+
})
65+
})
66+
})
6767

6868
return {
6969
nodes: new vis.DataSet(nodes),
7070
edges: new vis.DataSet(edges),
71-
};
72-
};
71+
}
72+
}
7373

7474
// causes a refresh of the network graph
7575
scope.setData = function setData() {
76-
scope.network.setData(scope.getData());
77-
};
76+
scope.network.setData(scope.getData())
77+
}
7878

7979
$rootScope.$on('anny:changed', function onChange() {
80-
scope.setData();
81-
});
80+
scope.setData()
81+
})
8282

8383
// create network
8484
scope.network =
85-
new vis.Network(elm[0], scope.getData(), visNetworkOptions);
85+
new vis.Network(elm[0], scope.getData(), visNetworkOptions)
8686
},
87-
};
87+
}
8888
}
8989

9090
angular.module('App.vis')
91-
.directive('visNetwork', visNetwork);
91+
.directive('visNetwork', visNetwork)

app/src/components/vis/vis-network-options-factory.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function visNetworkOptions() {
2-
var options = {};
2+
var options = {}
33

44
// Nodes
55
options.nodes = {
@@ -17,7 +17,7 @@ function visNetworkOptions() {
1717
},
1818
labelHighlightBold: true,
1919
mass: 1,
20-
};
20+
}
2121

2222
// Groups
2323
options.groups = {
@@ -51,7 +51,7 @@ function visNetworkOptions() {
5151
},
5252
},
5353
},
54-
};
54+
}
5555

5656
// Edges
5757
options.edges = {
@@ -66,20 +66,20 @@ function visNetworkOptions() {
6666
},
6767
hoverWidth: 1,
6868
selectionWidth: 1.5,
69-
};
69+
}
7070

7171
// Layout
7272
options.layout = {
7373
hierarchical: {
7474
direction: 'LR',
7575
},
76-
};
76+
}
7777

7878
// Interaction
7979
options.interaction = {
8080
hover: true,
8181
tooltipDelay: 150,
82-
};
82+
}
8383

8484
// Physics
8585
options.physics = {
@@ -101,10 +101,10 @@ function visNetworkOptions() {
101101
fit: true,
102102
},
103103
timestep: 0.5,
104-
};
104+
}
105105

106-
return options;
106+
return options
107107
}
108108

109109
angular.module('App.vis')
110-
.factory('visNetworkOptions', visNetworkOptions);
110+
.factory('visNetworkOptions', visNetworkOptions)

gulp/gulphelp.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ const gulpHelpConfig = {
88
afterPrintCallback: () => { // run after the default help task runs
99

1010
},
11-
};
11+
}
1212

13-
export default gulpHelpConfig;
13+
export default gulpHelpConfig

0 commit comments

Comments
 (0)