co2114 2026.0.3__tar.gz → 2026.1.0__tar.gz

{co2114-2026.0.3 → co2114-2026.1.0}/PKG-INFO

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

{co2114-2026.0.3 → co2114-2026.1.0}/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-2026.0.3 → co2114-2026.1.0}/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.3 → co2114-2026.1.0}/co2114.egg-info/PKG-INFO

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

{co2114-2026.0.3 → co2114-2026.1.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="co2114",
-    version="2026.0.3",
+    version="2026.1.0",
     description="codebase for co2114",
     author="wil ward",
     python_requires=">=3.12",