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

yusugomori · Jul 18, 2013 · 2d9d06d · 2d9d06d
1 parent cbd7833
commit 2d9d06d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
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
     }