- improved progressIndicator

- fixed Stack::trainingData()
- fixed test::main

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

source/Rbm.hpp

@@ -68,9 +68,9 @@ public:
 			gibbsDoSampleVisible = params.get("gibbsDoSampleVisible", gibbsDoSampleVisible) == 1;
 			gibbsDoSampleHidden = params.get("gibbsDoSampleHidden", gibbsDoSampleHidden) == 1;
 			doSampleBatch = params.get("doSampleBatch", doSampleBatch) == 1;
-			numGibbs = params.get("numGibbs", (int)numGibbs).asUInt();
-			miniBatchSize = params.get("miniBatchSize", (int)miniBatchSize).asUInt();
-			numEpochs = params.get("numEpochs", (int)numEpochs).asUInt();
+			numGibbs = params.get("numGibbs", numGibbs).asUInt();
+			miniBatchSize = params.get("miniBatchSize", miniBatchSize).asUInt();
+			numEpochs = params.get("numEpochs", numEpochs).asUInt();
 		}
 		
 		double weightDecay;
@@ -80,26 +80,22 @@ public:
 		bool gibbsDoSampleVisible;
 		bool gibbsDoSampleHidden;
 		bool doSampleBatch;
-		size_t numGibbs;
-		size_t miniBatchSize;
-		size_t numEpochs;
+		int numGibbs;
+		int miniBatchSize;
+		int numEpochs;
 	};
 
 	struct Status
 	{
 		Status()
-		: epoch(0)
-		, trainingSizeRemain(0)
-		, progress(0)
+		: progress(0)
 		, err(-1.0)
 		, err_total(-1.0)
 		, L1(-1.0)
 		, L2(-1.0)
 		{
 		}
-		size_t epoch;
-		size_t trainingSizeRemain;
-		double progress;
+		int progress;
 		double err;
 		double err_total;
 		double L1;