Skip to content

Commit eeb975c

Browse files
committed
working on adapter again
1 parent c9ae5ed commit eeb975c

File tree

3 files changed

+11
-69821
lines changed

3 files changed

+11
-69821
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Python 3.7+
1919
5. methodtools.
2020
6. flask and jinja2 (for web-ui)
2121
7. scikit-spatial
22+
8. z3
2223

2324
### Conda commands:
2425

@@ -28,6 +29,7 @@ Python 3.7+
2829
4. conda install -c conda-forge matplotlib
2930
5. conda install -c anaconda unittest2
3031
6. conda install -c conda-forge scikit-spatial
32+
7. conda install -c asmeurer z3 (optional for road generation)
3133

3234
## Configuration - create config.yaml
3335
copy the contents of config-sample.yaml file and create a new file "config.yaml" in the root directory of the project. Now change these configurations:

roadgen/controlLine/ControlPointIntersectionAdapter.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,9 @@ def getMinDistance(point: ControlPoint, adjPoint, laneConfigurations = None):
189189
prevPoint = adjPoints[prevIndex]
190190
nextPoint = adjPoints[nextIndex]
191191

192-
# print(f"prevPoint", prevPoint)
193-
# print(f"nextPoint", nextPoint)
192+
print(f"adjPoint", adjPoint)
193+
print(f"prevPoint", prevPoint)
194+
print(f"nextPoint", nextPoint)
194195

195196
n_left = 1
196197
n_right = 1
@@ -213,9 +214,9 @@ def getMinDistance(point: ControlPoint, adjPoint, laneConfigurations = None):
213214
else:
214215
minWithPrev = totalLaneWidth
215216

216-
# print(f"minWithPrev", minWithPrev)
217-
# print(f"totalLaneWidth", totalLaneWidth)
218-
# print(f"diffWithPrev", diffWithPrev)
217+
print(f"minWithPrev", minWithPrev)
218+
print(f"totalLaneWidth", totalLaneWidth)
219+
print(f"diffWithPrev", diffWithPrev)
219220

220221

221222
if minDistance < minWithPrev:
@@ -235,9 +236,9 @@ def getMinDistance(point: ControlPoint, adjPoint, laneConfigurations = None):
235236
else:
236237
minWithNext = totalLaneWidth
237238

238-
# print(f"minWithNext", minWithNext)
239-
# print(f"totalLaneWidth", totalLaneWidth)
240-
# print(f"diffWithNext", diffWithNext)
239+
print(f"minWithNext", minWithNext)
240+
print(f"totalLaneWidth", totalLaneWidth)
241+
print(f"diffWithNext", diffWithNext)
241242

242243
if minDistance < minWithNext:
243244
minDistance = minWithNext

0 commit comments

Comments
 (0)