Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion simbev/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.1.3"
__version__ = "2.0.0"
2 changes: 1 addition & 1 deletion simbev/car.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ def charge(
trip.simbev.hpc_data["soc_end_min"], trip.simbev.hpc_data["soc_end_max"]
)

if max_charging_time > trip.park_time:
if max_charging_time > trip.park_time and charging_type == "slow":
max_charging_time = trip.park_time

if power != 0:
Expand Down
4 changes: 3 additions & 1 deletion simbev/helpers/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,14 @@ def export_metadata(simbev, config):
]
]
meta_dict = {
"simBEV_version": __version__,
"SimBEV_version": __version__,
"scenario": simbev.name,
"timestamp_start": simbev.timestamp,
"timestamp_end": datetime.datetime.now().strftime("%Y-%m-%d_%H%M%S"),
"config": config._sections,
"tech_data": simbev.tech_data.to_dict(orient="index"),
"regions": simbev.region_data.to_dict(orient="index"),
"home_charging": simbev.home_parking.to_dict(),
"charge_prob_slow": simbev.charging_probabilities["slow"].to_dict(
orient="index"
),
Expand Down
1 change: 1 addition & 0 deletions simbev/simbev_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,7 @@ def from_config(cls, config_path):
pathlib.Path(scenario_path, cfg["rampup_ev"]["rampup"]),
sep=",",
index_col=0,
dtype={"region_id":str}
)

# read chargepoint probabilities
Expand Down
7 changes: 4 additions & 3 deletions simbev/trip.py
Original file line number Diff line number Diff line change
Expand Up @@ -549,10 +549,11 @@ def fit_trip_to_timerange(self):
and not self.car.output["location"][index] == "driving"
):
next_drive_timesteps = timestep
self.real_park_time = (
self.park_time + next_drive_timesteps - replacement_day_timestep
)
break
self.real_park_time = (
self.park_time + next_drive_timesteps - replacement_day_timestep
)

elif self.simbev.input_type == "profile":
next_drive_timesteps = self.car.driving_profile.loc[
self.car.driving_profile["time_step"] > replacement_day_timestep
Expand Down