- added projects and training data

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@592 b431acfa-c32f-4a4a-93f1-934dc6c82436

mnist_2.prj

@@ -0,0 +1,99 @@
+{
+   "stack" : {
+      "layers" : [
+         {
+            "id" : 0,
+            "name" : "Layer",
+            "numHidden" : 256,
+            "numVisibleX" : 28,
+            "numVisibleY" : 28,
+            "rbm" : {
+               "numHidden" : 256,
+               "numVisible" : 784,
+               "params" : {
+                  "doRaoBlackwell" : 1,
+                  "doSampleBatch" : 0,
+                  "gibbsDoSampleHidden" : 1,
+                  "gibbsDoSampleVisible" : 0,
+                  "learningRate" : 0.10000000000000001,
+                  "momentum" : 0.5,
+                  "numGibbs" : 1,
+                  "weightDecay" : 0,
+                  "weightInit" : 0.01
+               }
+            },
+            "weights_file" : "Layer.0.weights.dat"
+         },
+         {
+            "id" : 1,
+            "name" : "Layer",
+            "numHidden" : 128,
+            "numVisibleX" : 256,
+            "numVisibleY" : 1,
+            "rbm" : {
+               "numHidden" : 128,
+               "numVisible" : 256,
+               "params" : {
+                  "doRaoBlackwell" : 1,
+                  "doSampleBatch" : 0,
+                  "gibbsDoSampleHidden" : 1,
+                  "gibbsDoSampleVisible" : 0,
+                  "learningRate" : 0.10000000000000001,
+                  "momentum" : 0.5,
+                  "numGibbs" : 1,
+                  "weightDecay" : 0,
+                  "weightInit" : 0.01
+               }
+            },
+            "weights_file" : "Layer.1.weights.dat"
+         },
+         {
+            "id" : 2,
+            "name" : "Layer",
+            "numHidden" : 64,
+            "numVisibleX" : 128,
+            "numVisibleY" : 1,
+            "rbm" : {
+               "numHidden" : 64,
+               "numVisible" : 128,
+               "params" : {
+                  "doRaoBlackwell" : 1,
+                  "doSampleBatch" : 0,
+                  "gibbsDoSampleHidden" : 1,
+                  "gibbsDoSampleVisible" : 0,
+                  "learningRate" : 0.10000000000000001,
+                  "momentum" : 0.5,
+                  "numGibbs" : 1,
+                  "weightDecay" : 0,
+                  "weightInit" : 0.01
+               }
+            },
+            "weights_file" : "Layer.2.weights.dat"
+         },
+         {
+            "id" : 3,
+            "name" : "Layer",
+            "numHidden" : 32,
+            "numVisibleX" : 64,
+            "numVisibleY" : 1,
+            "rbm" : {
+               "numHidden" : 32,
+               "numVisible" : 64,
+               "params" : {
+                  "doRaoBlackwell" : 1,
+                  "doSampleBatch" : 0,
+                  "gibbsDoSampleHidden" : 1,
+                  "gibbsDoSampleVisible" : 0,
+                  "learningRate" : 0.10000000000000001,
+                  "momentum" : 0.5,
+                  "numGibbs" : 1,
+                  "weightDecay" : 0,
+                  "weightInit" : 0.01
+               }
+            },
+            "weights_file" : "Layer.3.weights.dat"
+         }
+      ],
+      "name" : "mnist_2"
+   }
+}

source/main.cpp

@@ -79,7 +79,7 @@ int main()
 {
 	printf("Hallo, Welt!\n");
 
-	const string project("mnist_2");
+	const string project("test");
 	
 	RbmListener statusDisplay;
 	Stack stack(project);
@@ -87,20 +87,20 @@ int main()
 	arma::mat batch = loadTraining(project + string(".training.dat"));
 
 	size_t numTraining = batch.n_rows;
-	size_t numVisibleX = 28;
-	size_t numVisibleY = 28;
-	size_t numHidden = 256;
-
 	printf("Loaded %d training samples\n", (int)numTraining);
 
-#if 1
+#if 0
+	size_t numVisibleX = 16;
+	size_t numVisibleY = 16;
+	size_t numHidden = 256;
+	
 	int i=0;
 	RbmLayer *lowerLayer = new RbmLayer("Layer", i, numVisibleX, numVisibleY, numHidden);
 	stack.addLayer(lowerLayer);
 	numHidden >>= 1;
 	
 	i++;
-	for (i; i < 4; i++)
+	for (i; i < 1; i++)
 	{
 		RbmLayer *layer = new RbmLayer("Layer", i, lowerLayer->bh().n_elem, 1, numHidden);
 		lowerLayer = layer;
@@ -118,13 +118,13 @@ int main()
 	stack.loadWeights();
 
 	// Train stack
-	stack.train(batch, 1000, 100, &statusDisplay);
+	stack.train(batch, 1000, 1000, &statusDisplay);
 
 	// Save weights
 	stack.saveWeights();
 
 	RbmLayer *layer = stack.getLayer(0);
-	arma::mat v = arma::randu(numTraining, numVisibleX*numVisibleY);
+	arma::mat v = arma::randu(numTraining, layer->bv().n_elem);
 	arma::mat h = layer->toHiddenProbs(v);
 	arma::mat r = layer->toVisibleProbs(h);
 	return 0;

test.prj

@@ -0,0 +1,30 @@
+{
+   "stack" : {
+      "layers" : [
+         {
+            "id" : 0,
+            "name" : "Layer",
+            "numHidden" : 256,
+            "numVisibleX" : 16,
+            "numVisibleY" : 16,
+            "rbm" : {
+               "numHidden" : 256,
+               "numVisible" : 256,
+               "params" : {
+                  "doRaoBlackwell" : 1,
+                  "doSampleBatch" : 0,
+                  "gibbsDoSampleHidden" : 1,
+                  "gibbsDoSampleVisible" : 0,
+                  "learningRate" : 0.10000000000000001,
+                  "momentum" : 0.5,
+                  "numGibbs" : 1,
+                  "weightDecay" : 0,
+                  "weightInit" : 0.01
+               }
+            },
+            "weights_file" : "Layer.0.weights.dat"
+         }
+      ],
+      "name" : "test"
+   }
+}