Fixed rate callback and tests

Swordnix · Jul 17, 2016 · c233227 · c233227
1 parent 8ff4f28
commit c233227
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 3 deletions.
diff --git a/dist/synaptic.js b/dist/synaptic.js
@@ -1983,6 +1983,7 @@
 
 	      var currentSetSize = set.length;
 	      error = 0;
+	      iterations++;
 
 	      if(bucketSize > 0) {
 	        var currentBucket = Math.floor(iterations / bucketSize);
@@ -2003,7 +2004,6 @@
 	      }
 
 	      // check error
-	      iterations++;
 	      error /= currentSetSize;
 
 	      if (options) {

diff --git a/src/trainer.js b/src/trainer.js
@@ -81,6 +81,7 @@ Trainer.prototype = {
 
       var currentSetSize = set.length;
       error = 0;
+      iterations++;
 
       if(bucketSize > 0) {
         var currentBucket = Math.floor(iterations / bucketSize);
@@ -101,7 +102,6 @@ Trainer.prototype = {
       }
 
       // check error
-      iterations++;
       error /= currentSetSize;
 
       if (options) {

diff --git a/test/synaptic.js b/test/synaptic.js
@@ -562,7 +562,7 @@ describe("Scheduled Tasks", function() {
     assert.equal( final_stats.iterations, 2000 )
   });
 
-  it('should work even if shedule.do() returns no value', function(){
+  it('should work even if schedule.do() returns no value', function(){
     var final_stats = perceptron.trainer.XOR({
       iterations: 3000,
       rate: 0.000001,
@@ -576,3 +576,85 @@ describe("Scheduled Tasks", function() {
   });
 
 });
+
+describe("Rate Callback Check", function() {
+  var perceptron = new Perceptron(2, 3, 1);
+
+  it('should switch rate from 0.01 to 0.005 after 1000 iterations', function(){
+    var final_stats = perceptron.trainer.XOR({
+      iterations: 2000,
+      rate: function(iterations, error) {
+        return iterations < 1000 ? 0.01 : 0.005
+      },
+      error: 0.000001,
+      schedule: {
+        every: 1,
+        do: function(data) {
+          if(data.iterations == 1){
+            assert.equal( data.rate, 0.01 )
+          }
+
+          if(data.iterations == 500){
+            assert.equal( data.rate, 0.01 )
+          }
+
+          if(data.iterations == 999){
+            assert.equal( data.rate, 0.01 )
+          }
+
+          if(data.iterations == 1000){
+            assert.equal( data.rate, 0.005 )
+          }
+
+          if(data.iterations == 1500){
+            assert.equal( data.rate, 0.005 )
+          }
+
+          if(data.iterations == 2000){
+            assert.equal( data.rate, 0.005 )
+          }
+        }
+      }
+    });
+  });
+});
+
+describe("Rate Array Check", function() {
+  var perceptron = new Perceptron(2, 3, 1);
+
+  it('should switch rate from 0.01 to 0.005 after 1000 iterations', function(){
+    var final_stats = perceptron.trainer.XOR({
+      iterations: 2000,
+      rate: [0.01, 0.005],
+      error: 0.000001,
+      schedule: {
+        every: 1,
+        do: function(data) {
+          if(data.iterations == 1){
+            assert.equal( data.rate, 0.01 )
+          }
+
+          if(data.iterations == 500){
+            assert.equal( data.rate, 0.01 )
+          }
+
+          if(data.iterations == 999){
+            assert.equal( data.rate, 0.01 )
+          }
+
+          if(data.iterations == 1000){
+            assert.equal( data.rate, 0.005 )
+          }
+
+          if(data.iterations == 1500){
+            assert.equal( data.rate, 0.005 )
+          }
+
+          if(data.iterations == 2000){
+            assert.equal( data.rate, 0.005 )
+          }
+        }
+      }
+    });
+  });
+});