Browse Source

remove old code

Bastien Sevajol 9 years ago
parent
commit
36d65121e9

+ 0 - 14
intelligine/simulation/pheromone/DirectionPheromone.py View File

@@ -52,20 +52,6 @@ class DirectionPheromone():
52 52
         direction = get_direction_for_degrees(direction_degrees)
53 53
 
54 54
         return direction
55
-        # # 1: On melange
56
-        # items = pheromone_info.items()
57
-        # shuffle(items)
58
-        # ph = OrderedDict(items)
59
-        # foo = True
60
-        # # 2: On trie par puissance
61
-        # ph_sorted = sorted(ph.items(), key=lambda x: x[1])
62
-        # # 3: On recupere les direction de la puissance max
63
-        # max_intensity = ph_sorted[0][1][1]
64
-        # max_directions = [direction_name for direction_name in pheromone_info
65
-        #                  if pheromone_info[direction_name][1] == max_intensity]
66
-        # # 4: On trie par age
67
-        # # 5: On recupere les directions de l'age le plus court
68
-        # # 6: On choisis une direction au hasard parmis elles (ou par rapport a direction precedente ??bug autre fois??)
69 55
 
70 56
     @staticmethod
71 57
     def get_best_pheromone_direction_in(context, reference_point, points, pheromone_type):

+ 1 - 23
intelligine/synergy/stigmergy/PheromonesManager.py View File

@@ -16,19 +16,10 @@ class PheromonesManager():
16 16
                                                          empty_value={})
17 17
         return PheromoneFlavour.new_from_raw_data(point_pheromones)
18 18
 
19
-        current_check = point_pheromones
20
-        for prepare_key in prepare:
21
-            if prepare_key not in current_check:
22
-                current_check[prepare_key] = {}
23
-            current_check = current_check[prepare_key]
24
-
25
-        return point_pheromones
26
-
27 19
     def set_flavour(self, position, flavour):
28 20
         self._context.metas.value.set(PHEROMON_INFOS, position, flavour.get_raw_data())
29 21
 
30
-    def get_pheromone(self, position, category, type, allow_empty=False, empty_value=None):
31
-        # TODO: empty_value as du sens ?
22
+    def get_pheromone(self, position, category, type, allow_empty=False):
32 23
         flavour = self.get_flavour(position)
33 24
         try:
34 25
             return flavour.get_pheromone(category, type)
@@ -37,19 +28,6 @@ class PheromonesManager():
37 28
                 return Pheromone()
38 29
             raise
39 30
 
40
-
41
-        pheromone = pheromones
42
-        for key in address[:-1]:
43
-            pheromone = pheromone[key]
44
-
45
-        if address[-1] not in pheromone:
46
-            if allow_empty:
47
-                pheromone[address[-1]] = empty_value
48
-            else:
49
-                raise KeyError()
50
-
51
-        return pheromone[address[-1]]
52
-
53 31
     def increment_with_pheromone(self, position, apposed_pheromone):
54 32
         flavour = self.get_flavour(position)
55 33
         try: