Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ngraham20
ngraham20 committed Apr 25, 2018
2 parents 1009873 + 8c1bad6 commit aaa8642
Show file tree
Hide file tree
Showing 5 changed files with 323 additions and 45 deletions.
10 changes: 10 additions & 0 deletions virtupet/Pudgi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,3 +334,13 @@ def select_parents(active_agent_list):
parents.append((high_happiness.pop(), high_happiness.pop()))

return parents

def make_decicion(self):
self.handler.load_file("./data/decisions.py")
decision_file = self.handler.get_data()
self.handler.load_file("./data/pudgi" + self.uid + ".json")
pudgi_file = self.handler.get_data()

if (random.random() > 0.5):
for decision in self.known_decisions:
name = decision["name"]
19 changes: 17 additions & 2 deletions virtupet/data/decisions.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{"decisions": [
[
{"name": "roll_ball", "values":
{"attachment": 0.2,
"humor": 0.3,
Expand Down Expand Up @@ -32,7 +32,7 @@
"excitement": 0.9,
"confidence": 0.1,
"contentment": 0.7,
"entertainment": 0.5,
"entertainment": 1,
"vitality": -0.7,
"mental_energy": -0.5,
"physical_energy": 0.3
Expand Down Expand Up @@ -89,6 +89,21 @@
"vitality": 0.1,
"mental_energy": 0.6,
"physical_energy": 0.3}
},
{
"name": "nothing",
"values": {
"attachment": 0.1,
"humor": 0.1,
"enjoyment": 0.1,
"excitement": 0.1,
"confidence": 0.1,
"contentment": 0.1,
"entertainment": 0.5,
"vitality": -0.1,
"mental_energy": -0.1,
"physical_energy": -0.1
}
}
]
}
148 changes: 148 additions & 0 deletions virtupet/data/pudgies/0x1607.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
{
"uid": "0x1607",
"name": "Haiden",
"dna": [
1,
0,
1,
0,
1,
1,
0,
0,
1,
1,
1,
1,
1,
1,
0,
1,
0,
0,
1,
0,
0,
0,
0,
0,
1,
1,
1,
0,
1,
0,
0,
1,
1,
0,
1,
1,
1,
1,
0,
1,
0,
1,
0,
0,
1,
1,
0,
0,
0,
1,
1,
0,
1,
1,
0,
1,
0,
0,
1,
1,
1,
0,
1,
1,
1,
1,
1,
0,
1,
1,
1,
1,
1,
0,
1,
1,
0,
1,
1,
1,
1,
0,
0,
1,
0,
0,
1,
1,
0,
0,
1,
1,
0,
1,
1,
1,
1,
1,
1,
0,
0,
1,
1,
1,
1,
1,
0,
1,
0,
0,
1,
1,
0,
1,
1,
1,
1,
0,
1,
0,
1,
1,
1,
0,
1,
1,
0,
0,
0,
1,
1,
0,
1,
1
],
"color": "Blue",
"personality": "ISFP",
"parents": [
null,
null
],
"happiness": 0.5,
"known_decisions": []
}
148 changes: 148 additions & 0 deletions virtupet/data/pudgies/0xf1f.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
{
"uid": "0xf1f",
"name": "Leah",
"dna": [
1,
0,
0,
1,
0,
0,
1,
1,
0,
1,
0,
1,
1,
0,
1,
1,
0,
0,
0,
0,
0,
1,
0,
0,
1,
0,
1,
0,
1,
0,
0,
0,
0,
0,
1,
1,
1,
1,
1,
0,
1,
0,
1,
0,
0,
1,
1,
1,
0,
1,
1,
0,
0,
1,
1,
0,
0,
0,
0,
1,
0,
1,
0,
1,
0,
0,
0,
1,
0,
1,
1,
1,
0,
1,
0,
1,
0,
1,
1,
0,
1,
1,
0,
0,
0,
0,
1,
0,
1,
0,
0,
0,
0,
0,
0,
0,
0,
1,
0,
1,
0,
1,
0,
0,
0,
0,
1,
1,
1,
0,
1,
1,
1,
0,
0,
0,
0,
1,
0,
0,
0,
1,
0,
0,
1,
0,
0,
0,
1,
1,
1,
0,
0,
1
],
"color": "Midnight",
"personality": "ISFP",
"parents": [
null,
null
],
"happiness": 0.5,
"known_decisions": []
}
43 changes: 0 additions & 43 deletions virtupet/decisions.py
View file

This file was deleted.

0 comments on commit aaa8642

Please sign in to comment.