- trainingdata always contains context

- load / store training batch with context
- on load: add context part to  legacy training batches 
- removed Rbm::setBatch()

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

source/main.cpp

@@ -81,8 +81,6 @@ int main()
 	
 	Stack stack(".", project);
 
-	stack.loadTrainingBatch();
-
 #if CREATE_TEST
 	stack.addTraining(stack.trainingBatch().row(1));
 	printf("There are %d training samples\n", (int)stack.trainingBatch().n_rows);
@@ -119,6 +117,10 @@ int main()
 	
 	// Load weights
 	stack.loadWeights();
+	
+	// Load training
+	stack.loadTrainingBatch();
+
 #endif	
 	
 #if TRAIN_TEST
@@ -132,6 +134,8 @@ int main()
 #endif
 	Layer *layer = stack.getLayer(0);
 	arma::mat v = stack.trainingBatch();
+	v.print("t");
+	layer->calcContextBatch(v);
 	arma::mat h = layer->toHiddenProbs(v);
 	arma::mat r = layer->toVisibleProbs(h);