testing displaced points

exercisemodel/__init__.py

@@ -62,11 +62,11 @@ def writeStatus(status):
 
 def run():
   try: 
-    # writeStatus("INITIAL")
+    print("INITIAL")
     strtree = STRtree(pickle.load(pkg_resources.resource_stream(__name__, '/'.join(('resources', 'strtree.pickle')))))
     m = Model()()
     with open('input.json',"r") as inputfile:
-      # writeStatus("PARTIAL")
+      print("PARTIAL")
       inputfeaturecollection = json.load(inputfile)
       output = {}
       multipointoutlet = {} 
@@ -87,13 +87,12 @@ def run():
 
       Cloudtrack.write(outputfeaturecollection)
       Particletrack.write(outputfeaturecollection)
-      # Output.write(outputfeaturecollection)
-      # writeStatus("COMPLETE")
+      print("COMPLETE")
 
     sys.exit(0)
   except Exception as error:
     print_exc()
-    # writeStatus("ERROR")
+    writeStatus("ERROR")
     sys.exit(1)
 '''
   To run in terminal call with python __init__.py 

exercisemodel/model.py

@@ -86,7 +86,7 @@ class Model(object):
 
 
   def createOutlet(self,geom):
-    nrOfParticles = 500
+    nrOfParticles = 100
     center = geom.centroid
     points = []
     depth = []
@@ -151,9 +151,9 @@ class Model(object):
     minoverlap = [float('Inf')] * len(points)
     radius = [0] * len(points)
     for i in range(len(points)):
-      radius[i] = 0.035 *  random.uniform(0.1, 1)
+      radius[i] = 0.0015 *  random.uniform(0.1, 1)
     while (p < len(points)):
-      pn = p + 1
+      pn = 0
       while (pn < len(points)):
         dx = points[p][0] - points[pn][0]
         dy = points[p][1] - points[pn][1]
@@ -215,10 +215,11 @@ class Model(object):
     mp = multipoint
     linestring = geometry.shape(exercisefeature['geometry'])
     for i, coord in enumerate(linestring.coords):
+      print(mp.centroid)
       points = self.centerPoints(coord, mp.centroid, mp.geoms)
-      # displacedpoints = self.displacePoints(points)
+      displacedpoints = self.displacePoints(points)
       # onlandpoints = self.onlandPoints(displacedpoints,strtree)
-      mp = geometry.MultiPoint(points)
+      mp = geometry.MultiPoint(displacedpoints)
       level = [0] * len(mp.geoms)
       category = [2] * len(mp.geoms)
       properties = self.createProperties((i+2), time[i], mp.centroid, level, category)
@@ -226,6 +227,5 @@ class Model(object):
       if (i % 10 == 0):
         Cloudtrack.write(featurecollection)
         Particletrack.write(featurecollection)
-        # Output.write(featurecollection)
 
     return featurecollection