[RBM]

- committed local changes

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

Source/MainComponent.h

@@ -38,7 +38,7 @@
                                                                     //[/Comments]
 */
 class MainComponent  : public Component,
-                       public LayerArrayListener<VisibleLayer>,
+                       public LayerArrayListener,
                        public RbmListener,
                        public DrawListener,
                        public Thread,
@@ -60,6 +60,14 @@ public:
     void buttonClicked (Button* buttonThatWasClicked);
     void sliderValueChanged (Slider* sliderThatWasMoved);
     void labelTextChanged (Label* labelThatHasChanged);
+    void mouseMove (const MouseEvent& e);
+    void mouseEnter (const MouseEvent& e);
+    void mouseExit (const MouseEvent& e);
+    void mouseDown (const MouseEvent& e);
+    void mouseDrag (const MouseEvent& e);
+    void mouseUp (const MouseEvent& e);
+    void mouseDoubleClick (const MouseEvent& e);
+    void mouseWheelMove (const MouseEvent& e, const MouseWheelDetails& wheel);
 
 
 
@@ -70,17 +78,19 @@ private:
     ScopedPointer<DrawComponent> DrawTraining;
     ScopedPointer<DrawComponent> DrawReconstruction;
     ScopedPointer<DrawComponent> DrawWeights;
+    ScopedPointer<DrawComponent> DrawVars;
     ScopedPointer<DrawComponent> DrawHidden;
 	uint32_t m_vNumX;
 	uint32_t m_vNumY;
 	uint32_t m_hNum;
-	LayerArray<VisibleLayer> m_layers;
+	LayerArray m_layers;
+	MatrixXd m_trainingData;
 	void load();
 	void save();
 	void create();
 	void destroy();
 	const juce::String& getBaseDir();
-	void onChanged(const LayerArray<VisibleLayer> &obj);
+	void onChanged(const LayerArray &obj);
 	void onEpochTrained(const Rbm &obj);
 	void onDraw(DrawComponent &obj);
 	void redrawReconstruction();
@@ -88,9 +98,6 @@ private:
 	void run();
 	String m_baseDir;
 	uint32_t m_numGibbs;
-	bool rbmReduceVarianceToggleButton_binary;
-	double sigma_gauss;
-	double sigmaDecay_gauss;
     //[/UserVariables]
 
     //==============================================================================
@@ -129,7 +136,7 @@ private:
     ScopedPointer<Label> momentumLabel;
     ScopedPointer<Label> sparsityLearningRateLabel;
     ScopedPointer<Label> weightInitLabel;
-    ScopedPointer<ToggleButton> rbmTrainV2ToggleButton;
+    ScopedPointer<ToggleButton> rbmLearnVarianceButton;
     ScopedPointer<ToggleButton> rbmNormalizeDataToggleButton;