Fix compatibility check using invalid layer getting function

daedsidog · Apr 26, 2019 · 7181147 · 7181147
1 parent 740e2e5
commit 7181147
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Fanna/net.cpp b/Fanna/net.cpp
@@ -64,8 +64,8 @@ void net::load(void) {
 	std::cout << "Loading " << netname << "..." << std::endl;
 	ann.create_from_file((std::stringstream() << netname << "\\" << netname << ".net").str());
 	if ((ann.get_num_input() != hindsight_level * 5) 
-		|| ((ann.get_num_layers() != hidden_layers) && !cascade_training)
-		|| ((ann.get_total_neurons() != 1 + hindsight_level * 5 + int(round(double(double(hindsight_level) * 5) * hidden_layer_factor)) * hidden_layers) && !cascade_training)) {
+		|| ((ann.get_num_layers() != hidden_layers + 2) && !cascade_training)
+		|| ((ann.get_total_neurons() - (ann.get_num_layers() - 1)  != 1 + hindsight_level * 5 + int(round(double(double(hindsight_level) * 5) * hidden_layer_factor)) * hidden_layers) && !cascade_training)) {
 		print_warning("Mismatch between ANN and configuration.");
 		reset();
 	}

diff --git a/Release/Fanna.dll b/Release/Fanna.dll
diff --git a/Release/config.txt b/Release/config.txt
@@ -8,5 +8,4 @@ cascade_training = 1		//	Binary value. Only RPROP and QUICKPROP work when cascad
 hidden_layers = 2
 shuffle_data = 0		//	Binary value
 report_interval = 1
-cascade_addend = 32
 hidden_layer_factor = 2.0