co2114 2026.0.2__py3-none-any.whl → 2026.1.0__py3-none-any.whl

co2114/agent/environment.py

@@ -26,10 +26,21 @@ class BaseEnvironment:
     """ Base Environment
             Adapted from AIMI code
     """
+    def __init__(self):
+        """ Base constructor """
+        self.__counter: int = 0
+
     def __repr__(self) -> str:
         """ Base string representation """
         return self.__class__.__name__
     
+    @property
+    def counter(self) -> int:
+        """ Tracker for number of iterations completed.
+        :return counter: Number of iterations in runtime simulation
+        """
+        return self.__counter
+
     @property
     def is_done(self) -> bool:
         """ Property indicating completion of simulation, needs overriding
@@ -54,6 +65,7 @@ class BaseEnvironment:
         print(f"{self}: Running for {steps} iterations.")
 
         for i in range(steps):
+            self.__counter += 1
             if self.is_done:  # print terination message and exit
                 print(f"{self}: Simulation complete after {i} of {steps} iterations.")
                 return
@@ -67,6 +79,7 @@ class Environment(BaseEnvironment):
     """
     def __init__(self):
         """ Initialises set of things and agents """
+        super().__init__()
         self.things = set()  # all things in environment
         self.agents = set()  # all agents in environment
 

co2114/search/graph.py

@@ -18,7 +18,7 @@ Label = str
 # Weight = Numeric
 
 # Example graph dictionary representing UK cities and distances between them
-UK_CITIES_GRAPH:dict[str, Iterable[str | tuple[str,str] | int]] = {
+UK_CITIES_GRAPH:dict[str, Iterable[str | tuple[str,str] | tuple[Numeric, Numeric] | int]] = {
     "nodes": ["Edinburgh", "Glasgow", "Manchester", "Liverpool",
              "Newcastle", "York", "Sheffield", "Leicester", 
              "London", "Bath", "Bristol", "Exeter", "Cardiff", "Birmingham"],
@@ -32,8 +32,13 @@ UK_CITIES_GRAPH:dict[str, Iterable[str | tuple[str,str] | int]] = {
              ("Birmingham", "Cardiff"), ("Leicester", "London"),
               ("Birmingham", "Leicester"),
              ("Birmingham", "London"), ("Birmingham", "Bristol"),
-             ("London", "Bristol"), ("Cardiff", "Bristol")],
-    "weights": [2,4,1,1,4,1,1,2,1,3,3,2,1,2,5,1,2,2,3,2,1]          
+             ("London", "Bristol"), ("Cardiff", "Bristol"), ("Bristol", "Bath"), ("Exeter", "Bristol"), ("Exeter", "London")],
+    "weights": [2,4,1,1,4,1,1,2,1,3,3,2,1,2,5,1,2,2,3,2,1,1,2,5],
+    "locations": [(55.9533, -3.1883), (55.8617, -4.2583), (53.4808, -2.2426),
+                  (53.4084, -2.9916), (54.9783, -1.6178), (53.9614, -1.0739),
+                  (53.3811, -1.4701), (52.6369, -1.1398), (51.5072, -0.1276),
+                  (51.3781, -2.3597), (51.4545, -2.5879), (50.7260, -3.5275),
+                  (51.4837, -3.1681), (52.4823, -1.8900)]
 }
 
 
@@ -188,13 +193,16 @@ class GraphEnvironment(Environment):
         super().__init__(*args, **kwargs)  # initialize base Environment
         self.graph = graph if isinstance(graph, Graph) else Graph() 
 
-
-    def add_node(self, node:Node) -> None:
+    
+    def add_node(self, node:Node, location:None | tuple = None) -> None:
         """ Add a node to the graph environment.
         
         :param node: Node to be added to the graph.
+        :param location: Optional location information of node, default None
         """
         self.graph.add_node(node)
+        if location is not None:
+            node.location = location
 
 
     @override
@@ -286,6 +294,12 @@ class GraphEnvironment(Environment):
             a, b = edge  # type: ignore
             nodes[a].add_neighbour(nodes[b], weight)  # add edge with weight
 
+        if 'locations' in graph_dict:
+            locations = graph_dict['locations']
+        else:
+            locations = [(0,0)]*len(nodes)
+        for key, location in zip(nodes, locations):
+            nodes[key].location = location # type: ignore
 
         # create environment and add nodes
         environment = cls()

{co2114-2026.0.2.dist-info → co2114-2026.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: co2114
-Version: 2026.0.2
+Version: 2026.1.0
 Summary: codebase for co2114
 Author: wil ward
 Requires-Python: >=3.12

{co2114-2026.0.2.dist-info → co2114-2026.1.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 co2114/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 co2114/engine.py,sha256=zN_jNil7xN52K9yJMTmEPARrL53kKwb_zg1BM6Cl6Jw,7043
 co2114/agent/__init__.py,sha256=4dQXJw6n6SJk3YDVtuRYuZjZvOIFfk6BkXfBA6UXLZg,34
-co2114/agent/environment.py,sha256=evDK7DulNHRv3llVXSuABzSWSxDLhLsMrKLOJjLSUKQ,18363
+co2114/agent/environment.py,sha256=f5m_xBd3AFK2gT1iFQBj52yWXibLSy4Tx4el5eN_aRM,18736
 co2114/agent/things.py,sha256=UUzwozCwmvqMIPSI9V3Fx-FmcCGiybxRhM6Mb1TqZcs,2278
 co2114/constraints/__init__.py,sha256=yDE8UZkEPk26YZRiBt-Rv3tZSfkoWo7T5zs2aTklyec,36
 co2114/constraints/magic.py,sha256=63iueMhdZyxImTkJ7lAMPalnun0ZeG3XrpSY2vzLLmM,3225
@@ -17,15 +17,15 @@ co2114/reasoning/cluedo.py,sha256=rMqrI_BDDiO0fWgOkhFuOOcB4dCl3Pf9OZEsmJ8safs,14
 co2114/reasoning/inference.py,sha256=j5NGkxdKS3jacBJUVxOnwquMY9Pm4nEt5JkxeyBV2CE,4625
 co2114/reasoning/logic.py,sha256=tQ5gLsczU_j9ATanA7uHHLdfxmW--VUO7u-78LJAgmY,10531
 co2114/search/__init__.py,sha256=UxLSQsWU2Q8WKBXb7cAqhR-NFRMf3_t7XPIO7oOGB8Y,45
-co2114/search/graph.py,sha256=JPtURul_PaE-zP0KTZSXCDOl2zRQ4nrqfonAf6sEvJU,17259
+co2114/search/graph.py,sha256=H3EM8tNWxejr0sD3c1qwpWcataHyl3jShvftWIGq0sw,18166
 co2114/search/maze.py,sha256=yveUVwQNtV3v8EGlAilSepZKgVbcd2bYt3GcATqrOVA,9947
 co2114/search/things.py,sha256=hdWq_2uTM1X603-QOcr5QEyo1CeEWbnOhILem0yd-Fg,1783
 co2114/search/util.py,sha256=J2SHFn7NuSMIbepjnI6PkkOt03f9qxi50Pw5rnA42IU,532
 co2114/util/__init__.py,sha256=5FC5sdGxQjrXI_tXBohVs2Vrsi-rP0sEz-ReGgf0tYw,1429
 co2114/util/colours.py,sha256=ipS3jGhiomhyRdQcdGhywIhxRBRbBIx6QboqPcL3GMs,757
 co2114/util/fonts.py,sha256=iL9al4B3F_w7EMG2lw7iLU4jA3uSqenMYY4zjhojtRk,504
-co2114-2026.0.2.dist-info/licenses/LICENSE,sha256=9KBazlyiIjZEG_wmBd9vkJZ0K0G7lsEX874rHL89FVs,1090
-co2114-2026.0.2.dist-info/METADATA,sha256=ZBrBYFn5Bj0vnc1PzxSVIahPUAioLU8PaQYQRtTZ8KY,438
-co2114-2026.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-co2114-2026.0.2.dist-info/top_level.txt,sha256=IrtPs7QmoV3CNxGgxSDrfx8VUgDdkbMaO6uVmutU9kg,7
-co2114-2026.0.2.dist-info/RECORD,,
+co2114-2026.1.0.dist-info/licenses/LICENSE,sha256=9KBazlyiIjZEG_wmBd9vkJZ0K0G7lsEX874rHL89FVs,1090
+co2114-2026.1.0.dist-info/METADATA,sha256=Xnq8VgTU1Zh66n9W6GVLKJ8eWxmzqdson27uR5dipIg,438
+co2114-2026.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+co2114-2026.1.0.dist-info/top_level.txt,sha256=IrtPs7QmoV3CNxGgxSDrfx8VUgDdkbMaO6uVmutU9kg,7
+co2114-2026.1.0.dist-info/RECORD,,