Improved error checking point coordinates

computationalgeography · Feb 15, 2024 · 8f5d4d2 · 8f5d4d2
1 parent 0d03d3b
commit 8f5d4d2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.18)
 
 project(campo
-  VERSION 0.3.9
+  VERSION 0.3.10
   DESCRIPTION "Modelling framework for fields and agents"
   HOMEPAGE_URL "https://campo.computationalgeography.org/"
   LANGUAGES NONE

diff --git a/source/campo/areas.py b/source/campo/areas.py
@@ -63,7 +63,9 @@ def read(self, filename):
             self.nr_items = len(content)
 
             self.p1 = Points()
+            self.p1.nr_items = self.nr_items
             self.p2 = Points()
+            self.p2.nr_items = self.nr_items
 
             x1 = numpy.zeros(self.nr_items)
             y1 = numpy.zeros(self.nr_items)

diff --git a/source/campo/points.py b/source/campo/points.py
@@ -1,8 +1,8 @@
 import csv
-import numpy
+import numpy as np
 
 
-class Points(object):
+class Points():
     def __init__(self, mobile=False):
 
         self.nr_items = None
@@ -40,16 +40,34 @@ def xcoord(self):
         return self._xcoord
 
     @xcoord.setter
-    def xcoord(self, value):
-        self._xcoord = value
+    def xcoord(self, values):
+        new_values = values
+        if new_values is not None:
+            if isinstance(values, list):
+                new_values = np.array(values)
+
+            if new_values.shape != (self.nr_items,):
+                msg = f"Number of provided coordinates ({new_values.shape[0]}) does not match number of agents ({self.nr_items})"
+                raise RuntimeError(msg)
+
+        self._xcoord = new_values
 
     @property
     def ycoord(self):
         return self._ycoord
 
     @ycoord.setter
-    def ycoord(self, value):
-        self._ycoord = value
+    def ycoord(self, values):
+        new_values = values
+        if new_values is not None:
+            if isinstance(values, list):
+                new_values = np.array(values)
+
+            if new_values.shape != (self.nr_items,):
+                msg = f"Number of provided coordinates ({new_values.shape[0]}) does not match number of agents ({self.nr_items})"
+                raise RuntimeError(msg)
+
+        self._ycoord = new_values
 
     @property
     def nr_items(self):
@@ -67,26 +85,15 @@ def read(self, filename):
 
             self.nr_items = len(content)
 
-            #x = numpy.zeros(self.nr_items)
-            #y = numpy.zeros(self.nr_items)
-
-            #for idx, item in enumerate(content):
-              #x[idx] = item[0]
-              #y[idx] = item[1]
-
-            #self.xcoord = x
-            #self.ycoord = y
-
-            v = numpy.empty((self.nr_items, 2))
+            v = np.empty((self.nr_items, 2))
             for idx, item in enumerate(content):
                 v[idx, 0] = item[0]
                 v[idx, 1] = item[1]
-             # numpy.random.shuffle(v)
 
             self.xcoord = v[:, 0]
             self.ycoord = v[:, 1]
 
-            self._coordinates = numpy.empty((self.nr_items, 2))
+            self._coordinates = np.empty((self.nr_items, 2))
 
     def __iter__(self):
         return self

diff --git a/source/test/test_mobile_agents.py b/source/test/test_mobile_agents.py
@@ -97,7 +97,7 @@ def test_1(self):
           curr_mp = self.a.mobile_points.get_space_domain(timestep)
           # set coordinates of current timestep
           curr_mp.xcoord = x_coords + timestep
-          curr_mp.ycoord = y_coords + timestep
+          curr_mp.ycoord = list(y_coords + timestep)
 
           self.a.mobile_points.set_space_domain(curr_mp, timestep)