Fix imports in python scripts.

python/simod/compute_adjectancy_matrix.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 
 from typing import Callable
 import pandas as pd

python/simod/compute_station_locations.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 
 import numpy as np
 import scipy.spatial

python/simod/config/simod_config.py

@@ -4,12 +4,12 @@
 from fconfig.config import Config
 
 
-from simod.config.statistics import Statistics
-from simod.config.analysis import Analysis
-from simod.config.images import Images
-from simod.config.comparison import Comparison
-from simod.config.ridesharing import Ridesharing
-from simod.config.agentpolis import Agentpolis
+from python.simod.config.statistics import Statistics
+from python.simod.config.analysis import Analysis
+from python.simod.config.images import Images
+from python.simod.config.comparison import Comparison
+from python.simod.config.ridesharing import Ridesharing
+from python.simod.config.agentpolis import Agentpolis
 import roadmaptools.config.roadmaptools_config
 from roadmaptools.config.roadmaptools_config import RoadmaptoolsConfig
 

python/simod/create_map_for_ap.py

@@ -17,7 +17,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from simod.init import config
+from python.simod.init import config
 
 import agentpolis.prepare_map
 

python/simod/demand.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 
 import pandas
 

python/simod/export_trips_for_agentpolis.py

@@ -21,8 +21,8 @@
 import numpy as np
 import os
 
-from simod.common import tutm2latlon
-from simod.common import load_trips
+from python.simod.common import tutm2latlon
+from python.simod.common import load_trips
 
 
 def export_data_for_amodsim(config, projection):

python/simod/filter_edges_for_figures.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 
 import roadmaptools.inout
 import roadmaptools.filter

python/simod/init.py

@@ -20,8 +20,8 @@
 import sys
 import roadmaptools.init
 
-import simod.config.simod_config
+import python.simod.config.simod_config
 
 # roadmaptools_config = roadmaptools.init.load_config(config, "roadmaptools", local_config,
 # 	r"C:\Workspaces\AIC\amod-to-agentpolis\src\main\resources\cz\cvut\fel\aic\amodsim\config/config.cfg")
-config = simod.config.simod_config.config
+config = python.simod.config.simod_config.config

python/simod/statistics/VGA_times.py

@@ -17,7 +17,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from simod.init import config
+from python.simod.init import config
 
 import csv
 import pandas as pd
@@ -26,7 +26,7 @@
 from matplotlib import ticker, gridspec
 from typing import Tuple
 
-from simod.statistics.comparisons.common import Experiment
+from python.simod.statistics.comparisons.common import Experiment
 
 
 def get_max_group_size_row(row: pd.Series, max_group_size: int = 11) -> int:

python/simod/statistics/archive/ridesharing_statistic.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config, roadmaptools_config
+from python.simod.init import config, roadmaptools_config
 
 import numpy as np
 import json

python/simod/statistics/archive/show_demand_distribution.py

@@ -24,8 +24,8 @@
 
 
 
-from simod.common import *
-from simod.shapes import load_shapes, plot_borders, plot_motorways, plot_roads, plot_trips
+from python.simod.common import *
+from python.simod.shapes import load_shapes, plot_borders, plot_motorways, plot_roads, plot_trips
 
 PRAGUE_DATA = '../../../data/prague/'
 SCK_SCALING_FACTOR = 2

python/simod/statistics/comparisons/copare_wait_times.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 
 import pandas
 import matplotlib.pyplot as plt

python/simod/statistics/comparisons/delay_comparison.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 
 import numpy as np
 import pandas as pd

python/simod/statistics/comparisons/density_map_scenario_comparison.py

@@ -17,17 +17,17 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from simod.init import config
+from python.simod.init import config
 
 import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
-import simod.statistics.model.traffic_load as traffic_load
-import simod.statistics.model.edges as edges
-import simod.statistics.trafic_density_map as trafic_density_map
+import python.simod.statistics.model.traffic_load as traffic_load
+import python.simod.statistics.model.edges as edges
+import python.simod.statistics.trafic_density_map as trafic_density_map
 
 from roadmaptools.printer import print_info
-from simod.statistics.model.vehicle_state import VehicleState
+from python.simod.statistics.model.vehicle_state import VehicleState
 
 FONT_SIZE = 14
 

python/simod/statistics/comparisons/distance_delay_tradeoff.py

@@ -16,17 +16,17 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 
 import matplotlib
 import matplotlib.pyplot as plt
-import simod.statistics.model.edges as edges
-import simod.statistics.model.transit as transit
-import simod.statistics.model.service as service
+import python.simod.statistics.model.edges as edges
+import python.simod.statistics.model.transit as transit
+import python.simod.statistics.model.service as service
 
 from typing import Tuple, List
 from pandas import DataFrame
-from simod.statistics.model.vehicle_state import VehicleState
+from python.simod.statistics.model.vehicle_state import VehicleState
 
 FONT_SIZE = 18
 

python/simod/statistics/comparisons/ridesharing_comparison_table.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 
 import numpy as np
 import pandas.errors
@@ -31,8 +31,8 @@
 from typing import List, Dict, Iterable
 from pandas import DataFrame
 from roadmaptools.printer import print_table, print_info
-from simod.statistics.traffic_density_histogram import TrafficDensityHistogram
-from simod.statistics.model.vehicle_state import VehicleState
+from python.simod.statistics.traffic_density_histogram import TrafficDensityHistogram
+from python.simod.statistics.model.vehicle_state import VehicleState
 
 
 def compute_stats_current_state(experiment_dir: str, result: Dict, histogram: TrafficDensityHistogram, load) -> List:

python/simod/statistics/demand_service.py

@@ -17,7 +17,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from simod.init import config, roadmaptools_config
+from python.simod.init import config, roadmaptools_config
 
 from tqdm import tqdm
 import numpy as np

python/simod/statistics/get_data_from_result.py

@@ -16,11 +16,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 import json
 import numpy as np
 
-from simod.utils import col_to_percent, to_percetnt
+from python.simod.utils import col_to_percent, to_percetnt
 from roadmaptools.printer import print_table
 
 

python/simod/statistics/model/demand_trips.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 
 import numpy as np
 

python/simod/statistics/occupancy.py

@@ -17,14 +17,14 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from amodsim.init import config
+from python.simod.init import config
 
 from tqdm import tqdm
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib
 import roadmaptools.inout
-import amodsim.utils
+import python.simod.utils
 
 from matplotlib.ticker import FuncFormatter
 from pandas import DataFrame
@@ -60,9 +60,10 @@ def to_percent(y, position):
 
 bins = np.arange(-0.5, 6.5, 1)
 
-axis.hist(occupancy_col, bins, normed=True)
+# axis.hist(occupancy_col, bins, normed=True)
+axis.hist(occupancy_col, bins, density=True, stacked=True)
 
-# plt.savefig(config.images.occupancy_histogram, bbox_inches='tight', transparent=True)
+plt.savefig(config.images.occupancy_histogram, bbox_inches='tight', transparent=True)
 
 
 # in window
@@ -82,9 +83,13 @@ def to_percent(y, position):
 # axis.set_xlabel("Vehicle occupancy [persons]")
 # axis.set_ylabel("Share of vehicles")
 
-axis.hist(occupancy_in_window, bins, normed=True)
+# axis.hist(occupancy_in_window, bins, normed=True)
+axis.hist(occupancy_in_window, bins, density=True, stacked=True)
+
+# plt.savefig(config.images.occupancy_histogram_window, bbox_inches='tight', transparent=True)
+save_results_to = '/Users/adela/Documents/bakalarka/randomdemand/img/'
+plt.savefig(save_results_to + 'occupancy-window', bbox_inches='tight', transparent=True)
 
-plt.savefig(config.images.occupancy_histogram_window, bbox_inches='tight', transparent=True)
 
 # occupancy in time
 df = DataFrame(data, columns=["period", "id", "occupancy"])
@@ -95,5 +100,6 @@ def to_percent(y, position):
 
 fig, axis = plt.subplots(1, 1, subplot_kw={"adjustable": 'box'}, figsize=(4, 3))
 axis.plot(avg_occupancies_per_period)
+plt.savefig(save_results_to + 'occupancy-in-time', bbox_inches='tight', transparent=True)
 
 plt.show()

python/simod/statistics/trip_statistics.py

@@ -16,12 +16,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from simod.init import config
+from python.simod.init import config
 
 import matplotlib
 import matplotlib.pyplot as plt
 from matplotlib.ticker import FuncFormatter
-from simod.statistics.model import trips
+from python.simod.statistics.model import trips
 
 HOURS_IN_DAY = 24