- RBM: changed calcualation of pre-weight update data in RBM

- always use expectations
- removed "Use Expectations Button"
- removed Robbins-Monro
- added sparsity learning rate
- added momentum
- added weight decay
- added Slider as progress bar



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

Source/MainComponent.h

@@ -74,9 +74,6 @@ private:
 	uint32_t m_vNumX;
 	uint32_t m_vNumY;
 	uint32_t m_hNum;
-	uint32_t m_vNumX_next;
-	uint32_t m_vNumY_next;
-	uint32_t m_hNum_next;
 	LayerArray<VisibleLayer> m_layers;
 	void load();
 	void save();
@@ -90,8 +87,10 @@ private:
 	void redrawWeights(int index);
 	void run();
 	String m_baseDir;
-	double m_trainingProgress;
 	uint32_t m_numGibbs;
+	bool rbmReduceVarianceToggleButton_binary;
+	double sigma_gauss;
+	double sigmaDecay_gauss;
     //[/UserVariables]
 
     //==============================================================================
@@ -117,9 +116,7 @@ private:
     ScopedPointer<TextButton> removeTrainingButton;
     ScopedPointer<Slider> numGibbsSlider;
     ScopedPointer<TextButton> reconstructEquButton;
-    ScopedPointer<ToggleButton> rbmUseExpectationsToggleButton;
     ScopedPointer<ToggleButton> rbmDoRaoBlackwellToggleButton;
-    ScopedPointer<ToggleButton> rbmDoRobbinsMonroToggleButton;
     ScopedPointer<ToggleButton> rbmReduceVarianceToggleButton;
     ScopedPointer<Label> lambdaLabel;
     ScopedPointer<Label> sigmaLabel;
@@ -127,7 +124,10 @@ private:
     ScopedPointer<ToggleButton> rbmDoSparseToggleButton;
     ScopedPointer<Label> sparsityLabel;
     ScopedPointer<Label> sigmaDecayLabel;
-    ScopedPointer<ProgressBar> m_progressBar;
+    ScopedPointer<Label> weightDecayLabel;
+    ScopedPointer<Slider> m_progressBarSlider;
+    ScopedPointer<Label> momentumLabel;
+    ScopedPointer<Label> sparsityLearningRateLabel;
 
 
     //==============================================================================