07/18/2013 yusugomori#1 fix C C++ Java Scala

Yusuke Sugomori · Yusuke Sugomori · commit 2d9d06de1052 · 2013-07-18T23:45:29.000+09:00
diff --git a/c/DBN.c b/c/DBN.c
@@ -347,7 +347,8 @@ void RBM_contrastive_divergence(RBM* this, int *input, double lr, int k) {
 
   for(i=0; i<this->n_hidden; i++) {
     for(j=0; j<this->n_visible; j++) {
-      this->W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;
+      // this->W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;
+      this->W[i][j] += lr * (ph_mean[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;
     }
     this->hbias[i] += lr * (ph_sample[i] - nh_means[i]) / this->N;
   }
diff --git a/c/RBM.c b/c/RBM.c
@@ -100,7 +100,8 @@ void RBM_contrastive_divergence(RBM* this, int *input, double lr, int k) {
 
   for(i=0; i<this->n_hidden; i++) {
     for(j=0; j<this->n_visible; j++) {
-      this->W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;
+      // this->W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;
+      this->W[i][j] += lr * (ph_mean[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;
     }
     this->hbias[i] += lr * (ph_sample[i] - nh_means[i]) / this->N;
   }
diff --git a/cpp/DBN.cpp b/cpp/DBN.cpp
@@ -322,7 +322,8 @@ void RBM::contrastive_divergence(int *input, double lr, int k) {
 
   for(int i=0; i<n_hidden; i++) {
     for(int j=0; j<n_visible; j++) {
-      W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
+      // W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
+      W[i][j] += lr * (ph_mean[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
     }
     hbias[i] += lr * (ph_sample[i] - nh_means[i]) / N;
   }
diff --git a/cpp/RBM.cpp b/cpp/RBM.cpp
@@ -89,7 +89,8 @@ void RBM::contrastive_divergence(int *input, double lr, int k) {
 
   for(int i=0; i<n_hidden; i++) {
     for(int j=0; j<n_visible; j++) {
-      W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
+      // W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
+      W[i][j] += lr * (ph_mean[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
     }
     hbias[i] += lr * (ph_sample[i] - nh_means[i]) / N;
   }
diff --git a/java/DBN/src/RBM.java b/java/DBN/src/RBM.java
@@ -91,7 +91,8 @@ public void contrastive_divergence(int[] input, double lr, int k) {
 		
 		for(int i=0; i<n_hidden; i++) {
 			for(int j=0; j<n_visible; j++) {
-				W[i][j] += lr *(ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
+				// W[i][j] += lr *(ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
+				W[i][j] += lr *(ph_mean[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
 			}
 			hbias[i] += lr * (ph_sample[i] - nh_means[i]) / N;
 		}
diff --git a/java/RBM/src/RBM.java b/java/RBM/src/RBM.java
@@ -91,7 +91,8 @@ public void contrastive_divergence(int[] input, double lr, int k) {
 		
 		for(int i=0; i<n_hidden; i++) {
 			for(int j=0; j<n_visible; j++) {
-				W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
+				// W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
+				W[i][j] += lr * (ph_mean[i] * input[j] - nh_means[i] * nv_samples[j]) / N;
 			}
 			hbias[i] += lr * (ph_sample[i] - nh_means[i]) / N;
 		}
diff --git a/scala/RBM.scala b/scala/RBM.scala
@@ -86,7 +86,8 @@ class RBM(val N: Int, val n_visible: Int, val n_hidden: Int,
     var j: Int = 0
     for(i <- 0 until n_hidden) {
       for(j <- 0 until n_visible) {
-        W(i)(j) += lr * (ph_sample(i) * input(j) - nh_means(i) * nv_samples(j)) / N
+        // W(i)(j) += lr * (ph_sample(i) * input(j) - nh_means(i) * nv_samples(j)) / N
+        W(i)(j) += lr * (ph_mean(i) * input(j) - nh_means(i) * nv_samples(j)) / N
       }
       hbias(i) += lr * (ph_sample(i) - nh_means(i)) / N
     }

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,8 @@ void RBM_contrastive_divergence(RBM* this, int *input, double lr, int k) {`
`347`	`347`
`348`	`348`	`for(i=0; i<this->n_hidden; i++) {`
`349`	`349`	`for(j=0; j<this->n_visible; j++) {`
`350`		`- this->W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;`
	`350`	`+ // this->W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;`
	`351`	`+ this->W[i][j] += lr * (ph_mean[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;`
`351`	`352`	`}`
`352`	`353`	`this->hbias[i] += lr * (ph_sample[i] - nh_means[i]) / this->N;`
`353`	`354`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@ void RBM_contrastive_divergence(RBM* this, int *input, double lr, int k) {`
`100`	`100`
`101`	`101`	`for(i=0; i<this->n_hidden; i++) {`
`102`	`102`	`for(j=0; j<this->n_visible; j++) {`
`103`		`- this->W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;`
	`103`	`+ // this->W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;`
	`104`	`+ this->W[i][j] += lr * (ph_mean[i] * input[j] - nh_means[i] * nv_samples[j]) / this->N;`
`104`	`105`	`}`
`105`	`106`	`this->hbias[i] += lr * (ph_sample[i] - nh_means[i]) / this->N;`
`106`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,8 @@ void RBM::contrastive_divergence(int *input, double lr, int k) {`
`322`	`322`
`323`	`323`	`for(int i=0; i<n_hidden; i++) {`
`324`	`324`	`for(int j=0; j<n_visible; j++) {`
`325`		`- W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;`
	`325`	`+ // W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;`
	`326`	`+ W[i][j] += lr * (ph_mean[i] * input[j] - nh_means[i] * nv_samples[j]) / N;`
`326`	`327`	`}`
`327`	`328`	`hbias[i] += lr * (ph_sample[i] - nh_means[i]) / N;`
`328`	`329`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ void RBM::contrastive_divergence(int *input, double lr, int k) {`
`89`	`89`
`90`	`90`	`for(int i=0; i<n_hidden; i++) {`
`91`	`91`	`for(int j=0; j<n_visible; j++) {`
`92`		`- W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;`
	`92`	`+ // W[i][j] += lr * (ph_sample[i] * input[j] - nh_means[i] * nv_samples[j]) / N;`
	`93`	`+ W[i][j] += lr * (ph_mean[i] * input[j] - nh_means[i] * nv_samples[j]) / N;`
`93`	`94`	`}`
`94`	`95`	`hbias[i] += lr * (ph_sample[i] - nh_means[i]) / N;`
`95`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,8 @@ public void contrastive_divergence(int[] input, double lr, int k) {`
`91`	`91`
`92`	`92`	`for(int i=0; i<n_hidden; i++) {`
`93`	`93`	`for(int j=0; j<n_visible; j++) {`
`94`		`- W[i][j] += lr (ph_sample[i] input[j] - nh_means[i] * nv_samples[j]) / N;`
	`94`	`+ // W[i][j] += lr (ph_sample[i] input[j] - nh_means[i] * nv_samples[j]) / N;`
	`95`	`+ W[i][j] += lr (ph_mean[i] input[j] - nh_means[i] * nv_samples[j]) / N;`
`95`	`96`	`}`
`96`	`97`	`hbias[i] += lr * (ph_sample[i] - nh_means[i]) / N;`
`97`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@ class RBM(val N: Int, val n_visible: Int, val n_hidden: Int,`
`86`	`86`	`var j: Int = 0`
`87`	`87`	`for(i <- 0 until n_hidden) {`
`88`	`88`	`for(j <- 0 until n_visible) {`
`89`		`- W(i)(j) += lr * (ph_sample(i) * input(j) - nh_means(i) * nv_samples(j)) / N`
	`89`	`+ // W(i)(j) += lr * (ph_sample(i) * input(j) - nh_means(i) * nv_samples(j)) / N`
	`90`	`+ W(i)(j) += lr * (ph_mean(i) * input(j) - nh_means(i) * nv_samples(j)) / N`
`90`	`91`	`}`
`91`	`92`	`hbias(i) += lr * (ph_sample(i) - nh_means(i)) / N`
`92`	`93`	`}`