push

include/gp.h

@@ -75,12 +75,7 @@ struct node
         
         void evaluate();
         
-        void evaluate_tree()
+        void evaluate_tree();
-        {
-            for (size_t i = 0; i < argc; i++)
-                sub_nodes[i]->evaluate_tree();
-            evaluate();
-        }
         
         void printTree()
         {

src/gp.cpp

@@ -21,6 +21,7 @@
 #include <functions.h>
 #include <random>
 #include <queue>
+#include <stack>
 
 blt::area_allocator<node, 32000> node_allocator;
 
@@ -211,4 +212,12 @@ node* node::clone()
     // tee hee
     ::new(np) node(*this);
     return np;
-}
+}
+
+void node::evaluate_tree()
+{
+    //std::stack<std::function<void()>> silly;
+    for (size_t i = 0; i < argc; i++)
+        sub_nodes[i]->evaluate_tree();
+    evaluate();
+}

src/main.cpp

@@ -213,7 +213,7 @@ class tree
         float fitness()
         {
             auto& img = root->getImage();
-            return eval_DNF_SW(img) * eval_DNF_SW_1(img) * static_cast<float>(depth(root.get()));
+            return eval_DNF_SW(img) * eval_DNF_SW_1(img) * static_cast<float>(std::min(depth(root.get()), 5ul));
         }
         
         void printTree()
@@ -446,7 +446,6 @@ void update(std::int32_t w, std::int32_t h)
     ImGui::Text("Physical Memory Usage: %s", blt::string::fromBytes(data.resident).c_str());
     ImGui::Text("Shared Memory Usage: %s", blt::string::fromBytes(data.shared).c_str());
     ImGui::Text("Total Memory Usage: %s", blt::string::fromBytes(data.size).c_str());
-    ImGui::Text("Stack Usage?: %s", blt::string::fromBytes(data.data - data.text - data.resident).c_str());
     
     auto lw = 512.0f;
     auto lh = 512.0f;