Restored screen refreshing to less demanding version.

SeppoPakonen · SeppoPakonen · commit e4907cd77646 · 2017-04-24T16:57:47.000+03:00
diff --git a/examples/CharGen/CharGen.cpp b/examples/CharGen/CharGen.cpp
@@ -51,7 +51,7 @@ CharGen::CharGen() {
 	PostCallback(THISBACK(Reload));
 	PostCallback(THISBACK(Start));
 	
-	SetTimeCallback(-40, THISBACK(Refresher));
+	PostCallback(THISBACK(Refresher));
 }
 
 CharGen::~CharGen() {
@@ -60,6 +60,8 @@ CharGen::~CharGen() {
 
 void CharGen::Refresher() {
 	network_view.Refresh();
+	
+	PostCallback(THISBACK(Refresher));
 }
 
 void CharGen::SetPreset(int i) {
diff --git a/examples/Classify2D/Classify2D.cpp b/examples/Classify2D/Classify2D.cpp
@@ -48,7 +48,7 @@ Classify2D::Classify2D() {
     
     PostCallback(THISBACK(OriginalData));
 	
-	SetTimeCallback(-40, THISBACK(Refresher));
+	PostCallback(THISBACK(Refresher));
 }
 
 Classify2D::~Classify2D() {
@@ -168,6 +168,7 @@ void Classify2D::Refresher() {
 		pctrl.Refresh();
 		lctrl.Refresh();
 	}
+	PostCallback(THISBACK(Refresher));
 }
 
 
diff --git a/examples/ClassifyImages/ClassifyImages.cpp b/examples/ClassifyImages/ClassifyImages.cpp
@@ -157,7 +157,7 @@ ClassifyImages::ClassifyImages(int loader, int type)
 	graph.SetSession(ses);
 	graph.SetModeLoss();
 	
-	SetTimeCallback(-40, THISBACK(Refresher));
+	PostCallback(THISBACK(Refresher));
 }
 
 ClassifyImages::~ClassifyImages() {
@@ -292,6 +292,8 @@ void ClassifyImages::Refresher() {
 		
 	graph.RefreshData();
 	RefreshStatus();
+	
+	PostCallback(THISBACK(Refresher));
 }
 
 void ClassifyImages::ResetAll() {
diff --git a/examples/GridWorld/GridWorld.cpp b/examples/GridWorld/GridWorld.cpp
@@ -33,7 +33,7 @@ GridWorld::GridWorld() {
 	
 	PostCallback(THISBACK1(Reset, true));
 	
-	SetTimeCallback(-40, THISBACK(Refresher));
+	PostCallback(THISBACK(Refresher));
 }
 
 GridWorld::~GridWorld() {
@@ -42,6 +42,8 @@ GridWorld::~GridWorld() {
 
 void GridWorld::Refresher() {
 	gworld.Refresh();
+	
+	PostCallback(THISBACK(Refresher));
 }
 
 void GridWorld::Reset(bool init_reward) {
diff --git a/examples/PuckWorld/PuckWorld.cpp b/examples/PuckWorld/PuckWorld.cpp
@@ -223,7 +223,7 @@ PuckWorld::PuckWorld() {
 	PostCallback(THISBACK(Reload));
 	RefreshEpsilon();
 	
-	SetTimeCallback(-40, THISBACK(Refresher));
+	PostCallback(THISBACK(Refresher));
 }
 
 PuckWorld::~PuckWorld() {
@@ -239,6 +239,8 @@ void PuckWorld::DockInit() {
 void PuckWorld::Refresher() {
 	pworld.Refresh();
 	RefreshStatus();
+	
+	PostCallback(THISBACK(Refresher));
 }
 
 void PuckWorld::Reset(bool init_reward, bool start) {
diff --git a/examples/Regression1D/Regression1D.cpp b/examples/Regression1D/Regression1D.cpp
@@ -19,6 +19,8 @@ Regression1D::Regression1D() {
 			"\t{\"type\":\"adadelta\", \"learning_rate\":0.01, \"momentum\":0, \"batch_size\":1, \"l2_decay\":0.001}\n"
 			"]\n";
 	
+	ses.SetTestPredict(true);
+	ses.SetPredictInterval(10);
 	
 	net_edit.SetData(t);
 	net_ctrl.Add(net_edit.HSizePos().VSizePos(0,30));
@@ -51,7 +53,7 @@ Regression1D::Regression1D() {
 	
 	network_view.SetSession(ses);
 	
-	SetTimeCallback(-40, THISBACK(Refresher));
+	PostCallback(THISBACK(Refresher));
 }
 
 void Regression1D::DockInit() {
@@ -62,6 +64,8 @@ void Regression1D::DockInit() {
 void Regression1D::Refresher() {
 	layer_ctrl.Refresh();
 	network_view.Refresh();
+	
+	PostCallback(THISBACK(Refresher));
 }
 
 void Regression1D::Reload() {
diff --git a/examples/RegressionPainter/RegressionPainter.cpp b/examples/RegressionPainter/RegressionPainter.cpp
@@ -55,7 +55,7 @@ RegressionPainter::RegressionPainter() {
 	
 	PostCallback(THISBACK(SetImage));
 	
-	SetTimeCallback(-40, THISBACK(Refresher));
+	PostCallback(THISBACK(Refresher));
 }
 
 void RegressionPainter::DockInit() {
@@ -84,6 +84,7 @@ void RegressionPainter::RefreshLearningRate() {
 void RegressionPainter::Refresher() {
 	RefreshStatus();
 	network_view.Refresh();
+	PostCallback(THISBACK(Refresher));
 }
 
 void RegressionPainter::Reload() {
diff --git a/examples/ReinforcedLearning/ReinforcedLearning.cpp b/examples/ReinforcedLearning/ReinforcedLearning.cpp
@@ -77,7 +77,7 @@ ReinforcedLearning::ReinforcedLearning() {
 	reward_graph.SetSession(world.agents[0].brain);
 	
 	PostCallback(THISBACK(Start));
-	SetTimeCallback(-40, THISBACK(Refresher));
+	PostCallback(THISBACK(Refresher));
 }
 
 ReinforcedLearning::~ReinforcedLearning() {
@@ -204,6 +204,7 @@ void ReinforcedLearning::Refresher() {
 		reward_graph.RefreshData();
 		RefreshStatus();
 	}
+	PostCallback(THISBACK(Refresher));
 }
 
 void ReinforcedLearning::LoadPreTrained() {
diff --git a/examples/TemporalDifference/TemporalDifference.cpp b/examples/TemporalDifference/TemporalDifference.cpp
@@ -74,7 +74,7 @@ TemporalDifference::TemporalDifference() {
 	PostCallback(THISBACK2(Reset, true, true));
 	PostCallback(THISBACK(Reload));
 	
-	SetTimeCallback(-40, THISBACK(Refresher));
+	PostCallback(THISBACK(Refresher));
 }
 
 TemporalDifference::~TemporalDifference() {
@@ -88,6 +88,8 @@ void TemporalDifference::DockInit() {
 
 void TemporalDifference::Refresher() {
 	gworld.Refresh();
+	
+	PostCallback(THISBACK(Refresher));
 }
 
 void TemporalDifference::Reload() {
diff --git a/examples/WaterWorld/WaterWorld.cpp b/examples/WaterWorld/WaterWorld.cpp
@@ -67,7 +67,7 @@ WaterWorld::WaterWorld() {
 	PostCallback(THISBACK(Start));
 	RefreshEpsilon();
 	
-	SetTimeCallback(-40, THISBACK(Refresher));
+	PostCallback(THISBACK(Refresher));
 }
 
 WaterWorld::~WaterWorld() {
@@ -102,6 +102,8 @@ void WaterWorld::Refresher() {
 	world.Refresh();
 	RefreshStatus();
 	network_view.Refresh();
+	
+	PostCallback(THISBACK(Refresher));
 }
 
 void WaterWorld::Start() {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ CharGen::CharGen() {`
`51`	`51`	`PostCallback(THISBACK(Reload));`
`52`	`52`	`PostCallback(THISBACK(Start));`
`53`	`53`
`54`		`- SetTimeCallback(-40, THISBACK(Refresher));`
	`54`	`+ PostCallback(THISBACK(Refresher));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`CharGen::~CharGen() {`
`@@ -60,6 +60,8 @@ CharGen::~CharGen() {`
`60`	`60`
`61`	`61`	`void CharGen::Refresher() {`
`62`	`62`	`network_view.Refresh();`
	`63`	`+`
	`64`	`+ PostCallback(THISBACK(Refresher));`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`void CharGen::SetPreset(int i) {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ Classify2D::Classify2D() {`
`48`	`48`
`49`	`49`	`PostCallback(THISBACK(OriginalData));`
`50`	`50`
`51`		`- SetTimeCallback(-40, THISBACK(Refresher));`
	`51`	`+ PostCallback(THISBACK(Refresher));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`Classify2D::~Classify2D() {`
`@@ -168,6 +168,7 @@ void Classify2D::Refresher() {`
`168`	`168`	`pctrl.Refresh();`
`169`	`169`	`lctrl.Refresh();`
`170`	`170`	`}`
	`171`	`+ PostCallback(THISBACK(Refresher));`
`171`	`172`	`}`
`172`	`173`
`173`	`174`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ ClassifyImages::ClassifyImages(int loader, int type)`
`157`	`157`	`graph.SetSession(ses);`
`158`	`158`	`graph.SetModeLoss();`
`159`	`159`
`160`		`- SetTimeCallback(-40, THISBACK(Refresher));`
	`160`	`+ PostCallback(THISBACK(Refresher));`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`ClassifyImages::~ClassifyImages() {`
`@@ -292,6 +292,8 @@ void ClassifyImages::Refresher() {`
`292`	`292`
`293`	`293`	`graph.RefreshData();`
`294`	`294`	`RefreshStatus();`
	`295`	`+`
	`296`	`+ PostCallback(THISBACK(Refresher));`
`295`	`297`	`}`
`296`	`298`
`297`	`299`	`void ClassifyImages::ResetAll() {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ GridWorld::GridWorld() {`
`33`	`33`
`34`	`34`	`PostCallback(THISBACK1(Reset, true));`
`35`	`35`
`36`		`- SetTimeCallback(-40, THISBACK(Refresher));`
	`36`	`+ PostCallback(THISBACK(Refresher));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`GridWorld::~GridWorld() {`
`@@ -42,6 +42,8 @@ GridWorld::~GridWorld() {`
`42`	`42`
`43`	`43`	`void GridWorld::Refresher() {`
`44`	`44`	`gworld.Refresh();`
	`45`	`+`
	`46`	`+ PostCallback(THISBACK(Refresher));`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`void GridWorld::Reset(bool init_reward) {`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ PuckWorld::PuckWorld() {`
`223`	`223`	`PostCallback(THISBACK(Reload));`
`224`	`224`	`RefreshEpsilon();`
`225`	`225`
`226`		`- SetTimeCallback(-40, THISBACK(Refresher));`
	`226`	`+ PostCallback(THISBACK(Refresher));`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`PuckWorld::~PuckWorld() {`
`@@ -239,6 +239,8 @@ void PuckWorld::DockInit() {`
`239`	`239`	`void PuckWorld::Refresher() {`
`240`	`240`	`pworld.Refresh();`
`241`	`241`	`RefreshStatus();`
	`242`	`+`
	`243`	`+ PostCallback(THISBACK(Refresher));`
`242`	`244`	`}`
`243`	`245`
`244`	`246`	`void PuckWorld::Reset(bool init_reward, bool start) {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ RegressionPainter::RegressionPainter() {`
`55`	`55`
`56`	`56`	`PostCallback(THISBACK(SetImage));`
`57`	`57`
`58`		`- SetTimeCallback(-40, THISBACK(Refresher));`
	`58`	`+ PostCallback(THISBACK(Refresher));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`void RegressionPainter::DockInit() {`
`@@ -84,6 +84,7 @@ void RegressionPainter::RefreshLearningRate() {`
`84`	`84`	`void RegressionPainter::Refresher() {`
`85`	`85`	`RefreshStatus();`
`86`	`86`	`network_view.Refresh();`
	`87`	`+ PostCallback(THISBACK(Refresher));`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`void RegressionPainter::Reload() {`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ ReinforcedLearning::ReinforcedLearning() {`
`77`	`77`	`reward_graph.SetSession(world.agents[0].brain);`
`78`	`78`
`79`	`79`	`PostCallback(THISBACK(Start));`
`80`		`- SetTimeCallback(-40, THISBACK(Refresher));`
	`80`	`+ PostCallback(THISBACK(Refresher));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`ReinforcedLearning::~ReinforcedLearning() {`
`@@ -204,6 +204,7 @@ void ReinforcedLearning::Refresher() {`
`204`	`204`	`reward_graph.RefreshData();`
`205`	`205`	`RefreshStatus();`
`206`	`206`	`}`
	`207`	`+ PostCallback(THISBACK(Refresher));`
`207`	`208`	`}`
`208`	`209`
`209`	`210`	`void ReinforcedLearning::LoadPreTrained() {`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ TemporalDifference::TemporalDifference() {`
`74`	`74`	`PostCallback(THISBACK2(Reset, true, true));`
`75`	`75`	`PostCallback(THISBACK(Reload));`
`76`	`76`
`77`		`- SetTimeCallback(-40, THISBACK(Refresher));`
	`77`	`+ PostCallback(THISBACK(Refresher));`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`TemporalDifference::~TemporalDifference() {`
`@@ -88,6 +88,8 @@ void TemporalDifference::DockInit() {`
`88`	`88`
`89`	`89`	`void TemporalDifference::Refresher() {`
`90`	`90`	`gworld.Refresh();`
	`91`	`+`
	`92`	`+ PostCallback(THISBACK(Refresher));`
`91`	`93`	`}`
`92`	`94`
`93`	`95`	`void TemporalDifference::Reload() {`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ WaterWorld::WaterWorld() {`
`67`	`67`	`PostCallback(THISBACK(Start));`
`68`	`68`	`RefreshEpsilon();`
`69`	`69`
`70`		`- SetTimeCallback(-40, THISBACK(Refresher));`
	`70`	`+ PostCallback(THISBACK(Refresher));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`WaterWorld::~WaterWorld() {`
`@@ -102,6 +102,8 @@ void WaterWorld::Refresher() {`
`102`	`102`	`world.Refresh();`
`103`	`103`	`RefreshStatus();`
`104`	`104`	`network_view.Refresh();`
	`105`	`+`
	`106`	`+ PostCallback(THISBACK(Refresher));`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`void WaterWorld::Start() {`