edit parent spawning and decision heuristic

ngraham20 · Apr 28, 2018 · f757f85 · f757f85
1 parent 4b368e2
commit f757f85
Show file tree

Hide file tree

Showing 34 changed files with 1,204 additions and 2,324 deletions.
diff --git a/virtupet/.idea/misc.xml b/virtupet/.idea/misc.xml
diff --git a/virtupet/Pudgi.py b/virtupet/Pudgi.py
@@ -323,11 +323,15 @@ def select_parents(active_agent_list):
         high_happiness = []
         parents = []
         for pudgi in active_agent_list:
-            if pudgi.happiness > .8:
-                high_happiness.append(pudgi.uid)
+            if pudgi.happiness > 9:
+                high_happiness.append(pudgi)
         for i in range(len(high_happiness)):
             if len(high_happiness) >= 2:
-                parents.append((high_happiness.pop(), high_happiness.pop()))
+                parent01 = high_happiness.pop()
+                parent02 = high_happiness.pop()
+                parents.append((parent01.uid, parent02.uid))
+                parent01.happiness = 2.0
+                parent02.happiness = 2.0
 
         return parents
 
@@ -384,9 +388,9 @@ def make_decision(self):
                     if dec["name"] == name:
                         t = dec["count"]
 
-                happiness = pow(ent, t) * ((pow(att, w_att))+(pow(hum, w_hum))+(pow(enj, w_enj)) +
+                happiness = .5 * (pow(ent, t) + ((pow(att, w_att))+(pow(hum, w_hum))+(pow(enj, w_enj)) +
                                          (pow(exc, w_exc)) + (pow(conf, w_conf))+(pow(cont, w_cont)) -
-                                         (pow(vit, w_vit)) - (pow(phy, w_phy)) - (pow(ment, w_ment)))
+                                         (pow(vit, w_vit)) - (pow(phy, w_phy)) - (pow(ment, w_ment))))
 
                 if happiness > happiness_optimized:
                     happiness_optimized = happiness
@@ -413,9 +417,9 @@ def make_decision(self):
                 ment = choice["values"]["mental_energy"]
                 ent = choice["values"]["entertainment"]
 
-                happiness_optimized = pow(ent, t)*((pow(att, w_att)) + (pow(hum, w_hum)) + (pow(enj, w_enj)) +
+                happiness_optimized = .5 * (pow(ent, t)+((pow(att, w_att)) + (pow(hum, w_hum)) + (pow(enj, w_enj)) +
                                                    (pow(exc, w_exc)) + (pow(conf, w_conf)) + (pow(cont, w_cont)) -
-                                                   (pow(vit, w_vit)) - (pow(phy, w_phy)) - (pow(ment, w_ment)))
+                                                   (pow(vit, w_vit)) - (pow(phy, w_phy)) - (pow(ment, w_ment))))
 
                 self.known_decisions.append({"name": choice["name"], "count": 0})
                 choice_index = len(self.known_decisions) - 1
@@ -437,3 +441,4 @@ def make_decision(self):
             print("Happiness increased by: " + str(happiness_optimized))
             print("Times chosen: " + str(self.known_decisions[choice_index]["count"]))
             print("---------------------------------------------")
+            print(str(self.name) + "'s Happiness: " + str(self.happiness))
diff --git a/virtupet/data/pudgies/0xd403.json → virtupet/data/pudgies/0x10404.json b/virtupet/data/pudgies/0xd403.json → virtupet/data/pudgies/0x10404.json
@@ -1,38 +1,47 @@
 {
-    "uid": "0xd403",
-    "name": "Landen",
+    "uid": "0x10404",
+    "name": "Jaidyn",
     "dna": [
-        1,
         0,
         0,
-        1,
+        0,
         0,
         1,
         1,
         1,
-        0,
-        1,
-        0,
         1,
         1,
+        0,
+        0,
         1,
         0,
         0,
+        0,
         1,
         0,
+        0,
         1,
         0,
         0,
+        0,
+        1,
+        0,
+        1,
+        1,
+        1,
         1,
         1,
         0,
+        1,
+        0,
+        1,
         0,
         1,
         1,
         1,
         1,
         0,
-        0,
+        1,
         1,
         0,
         0,
@@ -42,31 +51,27 @@
         0,
         1,
         0,
-        1,
         0,
         1,
-        1,
         0,
-        1,
         0,
-        1,
-        1,
         0,
         0,
         1,
         0,
         0,
         1,
-        1,
         0,
-        1,
         0,
+        1,
         0,
+        1,
+        1,
         0,
         0,
         1,
         1,
-        1,
+        0,
         0,
         1,
         1,
@@ -75,24 +80,21 @@
         0,
         0,
         0,
-        1,
-        1,
         0,
         0,
-        1,
+        0,
         1,
         1,
         1,
         0,
-        0,
+        1,
         0,
         1,
         1,
-        0,
-        0,
+        1,
         1,
         0,
-        0,
+        1,
         1,
         1,
         0,
@@ -101,49 +103,47 @@
         1,
         1,
         0,
-        0,
         1,
         0,
-        0,
+        1,
         0,
         1,
         1,
         0,
         0,
         1,
+        1,
         0,
         0,
         0,
         1,
-        0,
+        1,
         1,
         0,
         0,
         0,
-        1,
+        0,
         1,
         0,
+        1,
         0,
         0,
         1,
         1,
-        0,
         1,
-        0,
         1,
-        0,
         1,
         0,
         1,
         0
     ],
     "color": "Purple",
-    "personality": "ENFJ",
+    "personality": "ISTJ",
     "parents": [
         null,
         null
     ],
-    "happiness": 3.5538269738558705,
+    "happiness": 4.9400687759036614,
     "known_decisions": [
         {
             "name": "nothing",