updated conda installation

adhocmaster · adhocmaster · commit 6a92003cb416 · 2022-01-19T20:54:38.000-08:00
diff --git a/docs/source/installation.md b/docs/source/installation.md
@@ -45,7 +45,14 @@ If you are going to use the analysis tools, you need to make sure libgeos_c is i
 
 
 ### Option 1: Install via conda (recommended)
-Activate or create a conda environment for the project and run:
+1. Activate or create a conda environment for the project with python 3.6+
+2. Put the name of your environment in the first line of requirements.yml file (located in the root).
+
+```
+name: your_env_name
+```
+
+and run:
 
 :::{code-block}
 $ conda env update -f requirements.yml --prune
diff --git a/junctionart/roadgen/controlLine/ControlLineBasedGenerator.py b/junctionart/roadgen/controlLine/ControlLineBasedGenerator.py
@@ -27,8 +27,8 @@ def __init__(self, mapSize, debug=False,
                     randomizeLanes=True,
                     randomizeDistance = True, randomizeHeading=False,
                     country=CountryCodes.US, seed=101,
-                    nLaneDistributionOnASide=[0.15, 0.6, 0.2, 0.05],
-                    nLaneDistributionOnControlLines=[0.05, 0.45, 0.4, 0.1],
+                    nLaneDistributionOnASide=[0.1, 0.7, 0.18, 0.02],
+                    nLaneDistributionOnControlLines=[0.05, 0.5, 0.4, 0.05],
                     controlineLaneConfigurations = None,
                     
                     ) -> None:
diff --git a/tests/test_roadgen/controlLine/test_ControlLineBasedGenerator.py b/tests/test_roadgen/controlLine/test_ControlLineBasedGenerator.py
@@ -156,28 +156,28 @@ def test_running_time(self):
         heading = ["test configuration", "#tries", "#success", "total time (minutes)", "time per map (seconds)", "memory (MB)"]
         stats = []
 
-        count = 50
-        mapsize=(500, 500)
-        # goal generate count 400x400 maps with 2 lanes
-        tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=False, nControlLine=3, count=count)
-        # print(f"tries: {tryCount}, success: {successCount}, time: {durationInMin} Seconds, averageInSec: {averageInSec}")
-        stats.append([f"{count} {mapsize} square meter maps with 2 lanes", tryCount, successCount, durationInMin, averageInSec, memory])
+        # count = 50
+        # mapsize=(500, 500)
+        # # goal generate count 400x400 maps with 2 lanes
+        # tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=False, nControlLine=3, count=count)
+        # # print(f"tries: {tryCount}, success: {successCount}, time: {durationInMin} Seconds, averageInSec: {averageInSec}")
+        # stats.append([f"{count} {mapsize} square meter maps with 2 lanes", tryCount, successCount, durationInMin, averageInSec, memory])
 
-        # goal generate count 400x400 maps with random lanes
-        tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=True, nControlLine=3, count=count)
-        stats.append([f"{count} {mapsize} square meter maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
+        # # goal generate count 400x400 maps with random lanes
+        # tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=True, nControlLine=3, count=count)
+        # stats.append([f"{count} {mapsize} square meter maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
 
-        count = 50
-        mapsize=(1000, 1000)
-        # 2 lanes
-        tryCount, successCount, durationInMin, averageInSec, memory= self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=False, nControlLine=6, count=count)
-        stats.append([f"{count} {mapsize} square meter maps with 2 lanes", tryCount, successCount, durationInMin, averageInSec, memory])
+        # count = 50
+        # mapsize=(1000, 1000)
+        # # 2 lanes
+        # tryCount, successCount, durationInMin, averageInSec, memory= self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=False, nControlLine=6, count=count)
+        # stats.append([f"{count} {mapsize} square meter maps with 2 lanes", tryCount, successCount, durationInMin, averageInSec, memory])
 
-        # random lanes
-        tryCount, successCount, durationInMin, averageInSec, memory= self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=True, nControlLine=6, count=count)
-        stats.append([f"{count} {mapsize} square meter maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
+        # # random lanes
+        # tryCount, successCount, durationInMin, averageInSec, memory= self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=True, nControlLine=6, count=count)
+        # stats.append([f"{count} {mapsize} square meter maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
 
-        count = 25
+        count = 50
         mapsize=(5000, 5000)
         # 2 lanes
         tryCount, successCount, durationInMin, averageInSec, memory= self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=False, nControlLine=25, count=count)
@@ -187,39 +187,39 @@ def test_running_time(self):
         tryCount, successCount, durationInMin, averageInSec, memory= self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=True, nControlLine=25, count=count)
         stats.append([f"{count} {mapsize} square meter maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
 
-        # count = 4
-        # mapsize=(10000, 10000)
-        # # 2 lanes
-        # tryCount, successCount, durationInMin, averageInSec, memory= self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=False, nControlLine=50, count=count)
-        # stats.append([f"{count} {mapsize} square meter maps with 2 lanes", tryCount, successCount, durationInMin, averageInSec, memory])
-
-        # # random lanes
-        # tryCount, successCount, durationInMin, averageInSec, memory= self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=True, nControlLine=50, count=count)
-        # stats.append([f"{count} {mapsize} square meter maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
-
-        # test with manual
-        count = 50
-        mapsize=(1200, 1400)
-        # goal generate count 400x400 maps with 2 lanes
-        tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000ManualMaps(mapsize=mapsize, randomizeLanes=False, nControlLine=3, count=count)
-        # print(f"tries: {tryCount}, success: {successCount}, time: {durationInMin} Seconds, averageInSec: {averageInSec}")
-        stats.append([f"{count} {mapsize} manual control-line maps with 2 lanes", tryCount, successCount, durationInMin, averageInSec, memory])
-
-        # goal generate count 400x400 maps with random lanes
-        tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000ManualMaps(mapsize=mapsize, randomizeLanes=True, nControlLine=3, count=count)
-        stats.append([f"{count} {mapsize} manual control-line maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
-
-        # test with A
-        count = 50
-        mapsize=(1000, 1600)
-        # goal generate count 400x400 maps with 2 lanes
-        tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000AMaps(mapsize=mapsize, randomizeLanes=False, nControlLine=3, count=count)
-        # print(f"tries: {tryCount}, success: {successCount}, time: {durationInMin} Seconds, averageInSec: {averageInSec}")
-        stats.append([f"{count} {mapsize} A-shaped maps with 2 lanes", tryCount, successCount, durationInMin, averageInSec, memory])
-
-        # goal generate count 400x400 maps with random lanes
-        tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000AMaps(mapsize=mapsize, randomizeLanes=True, nControlLine=3, count=count)
-        stats.append([f"{count} {mapsize} A-shaped maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
+        # # count = 4
+        # # mapsize=(10000, 10000)
+        # # # 2 lanes
+        # # tryCount, successCount, durationInMin, averageInSec, memory= self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=False, nControlLine=50, count=count)
+        # # stats.append([f"{count} {mapsize} square meter maps with 2 lanes", tryCount, successCount, durationInMin, averageInSec, memory])
+
+        # # # random lanes
+        # # tryCount, successCount, durationInMin, averageInSec, memory= self.getRunningTimeStatsFor1000Maps(mapsize=mapsize, randomizeLanes=True, nControlLine=50, count=count)
+        # # stats.append([f"{count} {mapsize} square meter maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
+
+        # # test with manual
+        # count = 50
+        # mapsize=(1200, 1400)
+        # # goal generate count 400x400 maps with 2 lanes
+        # tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000ManualMaps(mapsize=mapsize, randomizeLanes=False, nControlLine=3, count=count)
+        # # print(f"tries: {tryCount}, success: {successCount}, time: {durationInMin} Seconds, averageInSec: {averageInSec}")
+        # stats.append([f"{count} {mapsize} manual control-line maps with 2 lanes", tryCount, successCount, durationInMin, averageInSec, memory])
+
+        # # goal generate count 400x400 maps with random lanes
+        # tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000ManualMaps(mapsize=mapsize, randomizeLanes=True, nControlLine=3, count=count)
+        # stats.append([f"{count} {mapsize} manual control-line maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
+
+        # # test with A
+        # count = 50
+        # mapsize=(1000, 1600)
+        # # goal generate count 400x400 maps with 2 lanes
+        # tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000AMaps(mapsize=mapsize, randomizeLanes=False, nControlLine=3, count=count)
+        # # print(f"tries: {tryCount}, success: {successCount}, time: {durationInMin} Seconds, averageInSec: {averageInSec}")
+        # stats.append([f"{count} {mapsize} A-shaped maps with 2 lanes", tryCount, successCount, durationInMin, averageInSec, memory])
+
+        # # goal generate count 400x400 maps with random lanes
+        # tryCount, successCount, durationInMin, averageInSec, memory = self.getRunningTimeStatsFor1000AMaps(mapsize=mapsize, randomizeLanes=True, nControlLine=3, count=count)
+        # stats.append([f"{count} {mapsize} A-shaped maps with random lanes", tryCount, successCount, durationInMin, averageInSec, memory])
 
 
         print("\n")
@@ -236,7 +236,7 @@ def getRunningTimeStatsFor1000Maps(self, mapsize, randomizeLanes, nControlLine,
         tryCount = 0
         successCount = 0
         startNS = time.process_time_ns()
-        for seed in range(1, count * 2):
+        for seed in range(1, count * 20):
             tryCount += 1
             try:
                 generator = ControlLineBasedGenerator(mapsize, debug=False, seed=seed, randomizeLanes=randomizeLanes, randomizeDistance=False, randomizeHeading=False)
@@ -246,6 +246,8 @@ def getRunningTimeStatsFor1000Maps(self, mapsize, randomizeLanes, nControlLine,
                 # odr.write_xml(xmlPath)
                 # extensions.view_road(odr, os.path.join('..',self.configuration.get("esminipath"))) 
                 successCount += 1
+
+                print(f"success {successCount}/{tryCount}")
                 if successCount == count:
                     break
             except:
