Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blaham17 people parcels share - after project #66

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
05c599c
created own versions of DARPSolver, HeuristicSolver, PFvehicle and Pl…
blaham17 Nov 19, 2021
70e22b3
created own versions of DARPSolver, HeuristicSolver, PFvehicle and Pl…
blaham17 Nov 23, 2021
f7d81c8
created own versions of DARPSolver, HeuristicSolver, PFvehicle and Pl…
blaham17 Nov 23, 2021
ef6d83a
updated Solver, created new classes for requests
blaham17 Nov 25, 2021
ef1ac06
almost finished Solver
blaham17 Nov 30, 2021
8da5595
simple test - problem with vehicles and storages
blaham17 Dec 2, 2021
2821efd
created new physical vehicle for People&Freight, and also Storage for…
blaham17 Dec 5, 2021
9040f86
finished Solver and physical vehicles
blaham17 Dec 9, 2021
c1fb4e0
functional Simple test with 2 vehicles, WIP checking for taxi availab…
blaham17 Jan 2, 2022
9694b24
corrected checking for taxi availability
blaham17 Jan 3, 2022
b58688e
corrected checking for taxi availability
blaham17 Jan 4, 2022
73b610d
corrected checking for taxi availability
blaham17 Jan 4, 2022
4f3cb49
minor changes
blaham17 Jan 14, 2022
f76d08e
finished solver, edited according to the paper
blaham17 Feb 17, 2022
951a2d7
preparation for integration, edit of vehicle classes to be compatible…
blaham17 Feb 18, 2022
a9d2b01
Created Demand package and edited related classes and methods
blaham17 Feb 24, 2022
df27836
Added PeopleFreightVehicleFactory, tweaked other Factories little bit…
blaham17 Feb 25, 2022
d3f2fc4
shared Demand Entity and Request - work in progress
blaham17 Mar 6, 2022
1d4ea5b
finished all methods and interface for enabling the handling of trans…
blaham17 Mar 6, 2022
1521bd6
fixing the generic types 01
blaham17 Mar 19, 2022
06bdc6b
fixed DemandAgent, problem in PhysicalPFVehicle
blaham17 Mar 22, 2022
b9499ae
fixing genericity 02
blaham17 Mar 30, 2022
58a301c
problems with creating vehicles in factory
blaham17 Apr 9, 2022
d7fc75f
simulation RUNS... but not quite
blaham17 Apr 13, 2022
38306e7
simulation RUNS... but not quite
blaham17 Apr 13, 2022
b4c2050
simulation RUNS... but not quite
blaham17 Apr 13, 2022
d78aa04
simulation runs, no cars
blaham17 Apr 14, 2022
7f2fd4c
vehicles don't show, fixed requests in Solver
blaham17 Apr 23, 2022
098df3f
vehicles are now visible, but packages are not. Solver being static c…
blaham17 Apr 26, 2022
7ea93a8
simulation works with vehicles and packages, exception at getDemandAg…
blaham17 May 4, 2022
994efed
fixed bugs in solver (dynamic vs static) v1
blaham17 May 26, 2022
5d9360f
Solver for dynamic scenario, no bugs
blaham17 May 28, 2022
7033ede
working solver for dynamic scenario
blaham17 May 30, 2022
c362050
PFheuristic without statistics
blaham17 Jun 7, 2022
9528cd8
working Statistics class and python statistic scripts
blaham17 Jun 15, 2022
c2318e7
working solver
blaham17 Jun 15, 2022
086086c
multi passenger insertion solver
blaham17 Jun 30, 2022
71d2570
final version
blaham17 Nov 8, 2022
e964496
added statistics scripts
blaham17 Jan 18, 2023
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: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*.pyc

data
/data/data.zip
PLOTS

nbactions*.xml
nb-configuration.xml
Expand Down
39 changes: 39 additions & 0 deletions actions_requests.uml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<Diagram>
<ID>JAVA</ID>
<OriginalElement>cz.cvut.fel.aic.simod.visual.ridesharing.peoplefreightheuristic.SimpleTest</OriginalElement>
<nodes>
<node x="931.0" y="357.0">cz.cvut.fel.aic.simod.ridesharing.model.PlanActionPickup</node>
<node x="349.0" y="517.0">cz.cvut.fel.aic.simod.ridesharing.model.PlanComputationRequestFreight</node>
<node x="172.0" y="0.0">cz.cvut.fel.aic.simod.ridesharing.model.DefaultPlanComputationRequest</node>
<node x="0.0" y="543.0">cz.cvut.fel.aic.simod.ridesharing.model.PlanComputationRequestPeople</node>
<node x="652.0" y="357.0">cz.cvut.fel.aic.simod.ridesharing.model.PlanActionDropoff</node>
<node x="500.0" y="645.0">cz.cvut.fel.aic.simod.visual.ridesharing.peoplefreightheuristic.SimpleTest</node>
</nodes>
<notes />
<edges>
<edge source="cz.cvut.fel.aic.simod.ridesharing.model.PlanComputationRequestFreight" target="cz.cvut.fel.aic.simod.ridesharing.model.DefaultPlanComputationRequest" relationship="GENERALIZATION">
<point x="0.0" y="-41.5" />
<point x="516.5" y="492.0" />
<point x="340.5" y="492.0" />
<point x="0.0" y="233.5" />
</edge>
<edge source="cz.cvut.fel.aic.simod.ridesharing.model.PlanComputationRequestPeople" target="cz.cvut.fel.aic.simod.ridesharing.model.DefaultPlanComputationRequest" relationship="GENERALIZATION">
<point x="0.0" y="-15.5" />
<point x="164.5" y="492.0" />
<point x="340.5" y="492.0" />
<point x="0.0" y="233.5" />
</edge>
</edges>
<settings layout="Hierarchic" zoom="1.0" showDependencies="false" x="683.0" y="481.0" />
<SelectedNodes>
<node>cz.cvut.fel.aic.simod.ridesharing.model.PlanActionDropoff</node>
</SelectedNodes>
<Categories>
<Category>Fields</Category>
<Category>Properties</Category>
</Categories>
<SCOPE>All</SCOPE>
<VISIBILITY>private</VISIBILITY>
</Diagram>

46 changes: 46 additions & 0 deletions local_config_files/10k_requests.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
simod_data_dir: 'data/'

experiment_name: 'PFheuristic_10k'

packages_on: true
trips_filename: 'trips_10k'
packages_filename: 'packages_10k'
packages_max_delay: 0
packages_capacity: 100

vehicles_per_station: 10

trips_multiplier: 1.0
start_time: 0

travel_time_provider: 'dm'


rebalancing:
{
on: false
}

ridesharing:
{
on: true

method: 'people-freight-heuristic'

max_prolongation_in_seconds: 600
}

agentpolis:
{
# srid for New York
srid: 32618

# 11,5 hours
simulation_duration:
{
days: 0
hours: 11
minutes: 30
seconds: 0
}
}
46 changes: 46 additions & 0 deletions local_config_files/20k_10h_base.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
simod_data_dir: 'data/'

experiment_name: 'MULTI_INSERTION_version/20k_10h'

packages_on: true
trips_filename: 'trips_doubled_20k'
packages_filename: 'packages_doubled_20k'
packages_max_delay: 0
packages_capacity: 100

vehicles_per_station: 12

trips_multiplier: 1.0
start_time: 0

travel_time_provider: 'dm'


rebalancing:
{
on: false
}

ridesharing:
{
on: true

method: 'pf-base'

max_prolongation_in_seconds: 600
}

agentpolis:
{
# srid for New York
srid: 32618

# 21 hours
simulation_duration:
{
days: 0
hours: 12
minutes: 0
seconds: 0
}
}
46 changes: 46 additions & 0 deletions local_config_files/20k_10h_insertion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
simod_data_dir: 'data/'

experiment_name: 'MULTI_INSERTION_version/20k_10h'

packages_on: true
trips_filename: 'trips_doubled_20k'
packages_filename: 'packages_doubled_20k'
packages_max_delay: 0
packages_capacity: 100

vehicles_per_station: 12

trips_multiplier: 1.0
start_time: 0

travel_time_provider: 'dm'


rebalancing:
{
on: false
}

ridesharing:
{
on: true

method: 'pf-base'

max_prolongation_in_seconds: 600
}

agentpolis:
{
# srid for New York
srid: 32618

# 21 hours
simulation_duration:
{
days: 0
hours: 12
minutes: 0
seconds: 0
}
}
46 changes: 46 additions & 0 deletions local_config_files/20k_1h_base.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
simod_data_dir: 'data/'

experiment_name: 'BASE_version/20k_2h'

packages_on: true
trips_filename: 'trips_20k_2h'
packages_filename: 'packages_20k_2h'
packages_max_delay: 0
packages_capacity: 100

vehicles_per_station: 50

trips_multiplier: 1.0
start_time: 0

travel_time_provider: 'dm'


rebalancing:
{
on: false
}

ridesharing:
{
on: true

method: 'pf-base'

max_prolongation_in_seconds: 600
}

agentpolis:
{
# srid for New York
srid: 32618

# 21 hours
simulation_duration:
{
days: 0
hours: 4
minutes: 0
seconds: 0
}
}
46 changes: 46 additions & 0 deletions local_config_files/20k_1h_insertion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
simod_data_dir: 'data/'

experiment_name: 'MULTI_INSERTION_version/20k_2h'

packages_on: true
trips_filename: 'trips_20k_2h'
packages_filename: 'packages_20k_2h'
packages_max_delay: 0
packages_capacity: 100

vehicles_per_station: 50

trips_multiplier: 1.0
start_time: 0

travel_time_provider: 'dm'


rebalancing:
{
on: false
}

ridesharing:
{
on: true

method: 'pf-multi-insertion'

max_prolongation_in_seconds: 600
}

agentpolis:
{
# srid for New York
srid: 32618

# 21 hours
simulation_duration:
{
days: 0
hours: 4
minutes: 0
seconds: 0
}
}
46 changes: 46 additions & 0 deletions local_config_files/20k_2h_base.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
simod_data_dir: 'data/'

experiment_name: 'BASE_version/20k_10h'

packages_on: true
trips_filename: 'trips_20k_10h'
packages_filename: 'packages_20k_10h'
packages_max_delay: 0
packages_capacity: 100

vehicles_per_station: 12

trips_multiplier: 1.0
start_time: 0

travel_time_provider: 'dm'


rebalancing:
{
on: false
}

ridesharing:
{
on: true

method: 'pf-base'

max_prolongation_in_seconds: 600
}

agentpolis:
{
# srid for New York
srid: 32618

# 21 hours
simulation_duration:
{
days: 0
hours: 12
minutes: 0
seconds: 0
}
}
46 changes: 46 additions & 0 deletions local_config_files/20k_2h_insertion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
simod_data_dir: 'data/'

experiment_name: 'MULTI_INSERTION_version/20k_10h'

packages_on: true
trips_filename: 'trips_20k_10h'
packages_filename: 'packages_20k_10h'
packages_max_delay: 0
packages_capacity: 100

vehicles_per_station: 12

trips_multiplier: 1.0
start_time: 0

travel_time_provider: 'dm'


rebalancing:
{
on: false
}

ridesharing:
{
on: true

method: 'pf-multi-insertion'

max_prolongation_in_seconds: 600
}

agentpolis:
{
# srid for New York
srid: 32618

# 21 hours
simulation_duration:
{
days: 0
hours: 12
minutes: 0
seconds: 0
}
}
Loading