Merge branch 'master' of git.clkl.de:ma/project

analysis/analyzers/__init__.py

@@ -14,22 +14,24 @@ from .render.biogames import SimulationRoundsRender, BoardDurationHistRender, Bo
 from .render.default import PrintRender, JSONRender, TrackRender, HeatMapRender, LogEntryCountAnalyzerPlot, \
 	LogEntryCountCSV, KMLRender
 from .render.locomotion import LocomotionActionRelativeRender, LocomotionActionAbsoluteRender, \
-	LocomotionActionRatioRender
+	LocomotionActionRatioRender, LocomotionActionRatioHistRender
 
 __FALLBACK__ = PrintRender
 __MAPPING__ = {
 	LocomotionActionAnalyzer: [
 		LocomotionActionAbsoluteRender,
 		LocomotionActionRelativeRender,
-		LocomotionActionRatioRender, ],
+		LocomotionActionRatioRender,
+		LocomotionActionRatioHistRender,
+	],
 	LogEntryCountAnalyzer: [
 		# JSONRender,
 		LogEntryCountAnalyzerPlot,
 		LogEntryCountCSV,
 	],
 	SimulationRoundsAnalyzer: [
-		JSONRender,
 		SimulationRoundsRender,
+		SimulationRoundsMeanRender,
 	],
 	BoardDurationAnalyzer: [
 		BoardDurationHistRender,

analysis/analyzers/analyzer/__init__.py

@@ -18,7 +18,6 @@ class Result:
 		return self.__analysis__
 
 	def get(self):
-		log.debug("get" + str(len(self.result)))
 		return self.result
 
 	def __repr__(self):

analysis/analyzers/analyzer/biogames.py

@@ -28,7 +28,7 @@ class BoardDurationAnalyzer(Analyzer):
 			board_id, timestamp = board["id"], board["timestamp"]
 
 			if not last_timestamp is None:
-				result.append(self.save_entry(last_board, last_timestamp, timestamp - last_timestamp))
+				result.append(self.save_entry(last_board, last_timestamp, (timestamp - last_timestamp)/1000))
 			last_timestamp = timestamp
 			last_board = board_id
 		# TODO: last board?

analysis/analyzers/analyzer/locomotion.py

@@ -1,6 +1,9 @@
 from analysis import util
 from . import Analyzer, LogSettings, Result, ResultStore
 
+log: logging.Logger = logging.getLogger(__name__)
+ONE_DAY = 24 * 60 * 60 * 1000
+MIN_DURATION = 5 * 60 * 1000
 
 def init_filter(settings: LogSettings, state: str) -> callable:
 	# this implies OR for lists; AND for dicts
@@ -19,6 +22,8 @@ class LocomotionActionAnalyzer(Analyzer):
 	"""
 	__name__ = "LocomotionAction"
 
+	limit = ONE_DAY
+	
 	def process(self, entry: dict) -> bool:
 		self.last_timestamp = entry["timestamp"]
 		if self.instance_start is None:
@@ -50,13 +55,22 @@ class LocomotionActionAnalyzer(Analyzer):
 			self.last = None
 		locomotion = sum(self.locomotion)
 		action = sum(self.actions)
+		if not action > 0:
+			action = 1
 		total = locomotion + action
+		if total > self.limit:
+			log.error("total duration over limit, skip")
+		elif total < MIN_DURATION:
+			log.error("total duration too short, skip")
+		elif action < MIN_DURATION:
+			log.error("action time too short, skip")
+		else:
 			store.add(Result(type(self), {
-			'locomotion_sum': locomotion,
-			'action_sum': action,
+				'locomotion_sum': locomotion/1000,
+				'action_sum': action/1000,
 				'locomotion': self.locomotion,
 				'action': self.actions,
-			'duration': (self.last_timestamp - self.instance_start),
+				'duration': (self.last_timestamp - self.instance_start)/1000,
 				'locomotion_relative': locomotion / total,
 				'action_relative': action / total,
 				'locomotion_action_ratio': locomotion / action,

analysis/analyzers/render/locomotion.py

@@ -1,3 +1,5 @@
+import json
+import logging
 from typing import List
 
 import matplotlib.pyplot as plt
@@ -6,6 +8,14 @@ import numpy as np
 from . import Render
 from .. import Result, LocomotionActionAnalyzer
 
+log = logging.getLogger(__name__)
+
+def default(item):
+	return item
+def sort(item):
+	return item[0]
+def sort_sum(item):
+	return sum(item)
 
 def plot(results: [[int]], ylabel: str, title: str, legend: (str,) = ("Locomotion", "Action")):
 	size = len(results)
@@ -38,11 +48,12 @@ def plot_line(results: [[int]], ylabel="Ratio", title="Locomotion/Action "):
 	plt.show()
 
 
-def filter_results(raw_results: [Result], keys) -> [[int]]:
+def filter_results(raw_results: [Result], keys, sort=default) -> [[int]]:
 	results = []
 	for result in raw_results:
 		raw = result.get()
 		results.append([raw[k] for k in keys])
+	results = sorted(results,key=sort)
 	return results
 
 
@@ -66,3 +77,12 @@ class LocomotionActionRatioRender(LocomotionActionRender):
 	def render(self, results: List[Result], name=None):
 		results = filter_results(self.filter(results), ['locomotion_action_ratio'])
 		plot_line(results, ylabel="Ratio", title="Locomotion/Action Ratio")
+
+class LocomotionActionRatioHistRender(LocomotionActionRender):
+	def render(self, results: List[Result]):
+		results = filter_results(self.filter(results), ['locomotion_action_ratio'])
+		plt.title("locomotion/action")
+		plt.xlabel("ratio")
+		plt.ylabel("frequency")
+		n, bins, patches = plt.hist([results], bins=len(results))
+		plt.show()

analysis/biogames2.json

@@ -27,6 +27,7 @@
       "SimulationCategorizer",
       "InstanceConfig"],
   "disabled_analyzers": [
+      "ActivityMapper",
       "LocomotionActionAnalyzer",
       "LogEntryCountAnalyzer",
     "LocationAnalyzer",