Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DALSim
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Thibaut DEMARE
DALSim
Commits
592fd5dc
Commit
592fd5dc
authored
6 years ago
by
ThibautDemare
Browse files
Options
Downloads
Patches
Plain Diff
Remove useless old commented piece of code and rename function add_network to add_mode
parent
72717d73
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
models/Main.gaml
+4
-36
4 additions, 36 deletions
models/Main.gaml
with
4 additions
and
36 deletions
models/Main.gaml
+
4
−
36
View file @
592fd5dc
...
...
@@ -7,26 +7,6 @@ import "ForwardingAgent.gaml"
import "Vehicle.gaml"
import "Perturbator.gaml"
import "Experiments.gaml"
/*
import "AwaitingStock.gaml"
import "LogisticsServiceProvider.gaml"
import "Building.gaml"
import "Commodity.gaml"
import "FinalDestinationManager.gaml"
import "Networks.gaml"
import "Observer.gaml"
import "Order.gaml"
import "Parameters.gaml"
import "Provider.gaml"
import "Stock.gaml"
import "Strategies.gaml"
import "SupplyChain.gaml"
import "Terminals.gaml"
import "TransferredStocks.gaml"
import "Transporters.gaml"
import "Warehouse.gaml"
*/
/*
* Init global variables and agents
...
...
@@ -172,7 +152,7 @@ global {
* The following code can be commented or not, depending if the user want to execute the simulation with every FDM
* It is mainly used for tests to avoid CPU overload.
*/
int i <-
1
00;
int i <-
4
00;
list<FinalDestinationManager> lfdm <- shuffle(FinalDestinationManager);
loop while: i < length(lfdm) {
FinalDestinationManager s <- lfdm[i];
...
...
@@ -208,25 +188,13 @@ global {
do init_networks;
}
// This is useless right ?
// Provider LHP <- nil;
// Provider AntP <- nil;
// ask Provider {
// if(self.port = "LE HAVRE"){
// LHP <- self;
// }
// else{
// AntP <- self;
// }
// }
// We initialyse the networks but this time for the forwarding agent so he can compute multi-modal shortest paths
ask ForwardingAgent {
do add_
network
network:road_network mode:'road' nodes:
do add_
mode
network:road_network mode:'road' nodes:
buildingOfFDM + (Warehouse as list) + (MaritimeTerminal as list) + (RiverTerminal as list) + (MaritimeRiverTerminal as list);
do add_
network
network:maritime_network mode:'maritime' nodes:
do add_
mode
network:maritime_network mode:'maritime' nodes:
(Provider as list) + (MaritimeTerminal as list) + (MaritimeRiverTerminal as list);
do add_
network
network:river_network mode:'river' nodes:
do add_
mode
network:river_network mode:'river' nodes:
(RiverTerminal as list) + (MaritimeRiverTerminal as list);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment