Skip to content
Snippets Groups Projects
Commit 8aa2ef7b authored by Egli Adrian (IT-SCI-API-PFI)'s avatar Egli Adrian (IT-SCI-API-PFI)
Browse files

refactored vec2 op

parent ba4e4b77
No related branches found
No related tags found
No related merge requests found
...@@ -75,10 +75,10 @@ def realistic_rail_generator(num_cities=5, ...@@ -75,10 +75,10 @@ def realistic_rail_generator(num_cities=5,
# station main orientation (horizontal or vertical # station main orientation (horizontal or vertical
rot_angle = np.random.choice(rotation_angles_set) rot_angle = np.random.choice(rotation_angles_set)
add_pos_val = Vec2d.scale(Vec2d.rotate((1, 0), rot_angle), add_pos_val = Vec2d.scale(Vec2d.rotate((1, 0), rot_angle),
int(max(1.0, (intern_city_size - 3) / 2))) int(max(1.0, (intern_city_size - 3) / 2)))
generate_city_locations[i][0] = Vec2d.add(generate_city_locations[i][1], add_pos_val) generate_city_locations[i][0] = Vec2d.add(generate_city_locations[i][1], add_pos_val)
add_pos_val = Vec2d.scale(Vec2d.rotate((1, 0), 180 + rot_angle), add_pos_val = Vec2d.scale(Vec2d.rotate((1, 0), 180 + rot_angle),
int(max(1.0, (intern_city_size - 3) / 2))) int(max(1.0, (intern_city_size - 3) / 2)))
generate_city_locations[i][1] = Vec2d.add(generate_city_locations[i][1], add_pos_val) generate_city_locations[i][1] = Vec2d.add(generate_city_locations[i][1], add_pos_val)
return generate_city_locations return generate_city_locations
...@@ -248,7 +248,7 @@ def realistic_rail_generator(num_cities=5, ...@@ -248,7 +248,7 @@ def realistic_rail_generator(num_cities=5,
continue continue
ens = e_nodes[city_loop_find_shortest] ens = e_nodes[city_loop_find_shortest]
for en in ens: for en in ens:
d = Vec2d.get_euclidean_distance(start_node,en) d = Vec2d.get_euclidean_distance(start_node, en)
if d < min_distance: if d < min_distance:
min_distance = d min_distance = d
end_node = en end_node = en
...@@ -450,6 +450,7 @@ def realistic_rail_generator(num_cities=5, ...@@ -450,6 +450,7 @@ def realistic_rail_generator(num_cities=5,
return generator return generator
if os.path.exists("./../render_output/"): if os.path.exists("./../render_output/"):
for itrials in range(1000): for itrials in range(1000):
print(itrials, "generate new city") print(itrials, "generate new city")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment