From 12ffda1196fc05e70d99170713739ed5ddfe27fe Mon Sep 17 00:00:00 2001
From: Gjorgji <g.noveski@yahoo.com>
Date: Fri, 31 Mar 2023 18:20:50 +0200
Subject: [PATCH] Fixes helsinki: ferry file not found, before sim script, and
messina before sim script
---
population_generation/helsinki_population.R | 2 ++
population_generation/messina_population.R | 1 +
population_generation/messina_preprocess.py | 1 +
.../ijs/urbanite/simserver/simulation/SimulationRunService.java | 2 +-
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/population_generation/helsinki_population.R b/population_generation/helsinki_population.R
index d715571..7d943d6 100644
--- a/population_generation/helsinki_population.R
+++ b/population_generation/helsinki_population.R
@@ -10,6 +10,8 @@ colnames(cons) <- c('district',c(1:7),c('m','f','totals'))
#remove district
districts <- cons[1]
cons <- cons[,-c(1)]
+cons <- cons[,-c(1,dim(cons)[2])]
+
ind$age <- as.character(ind$age)
diff --git a/population_generation/messina_population.R b/population_generation/messina_population.R
index 331d09d..7c8d53a 100644
--- a/population_generation/messina_population.R
+++ b/population_generation/messina_population.R
@@ -11,6 +11,7 @@ colnames(cons) <- c('district',c(1:5),c('f','m','totals'))
#remove district and totals
districts <- cons[1]
#cons <- cons[,-c(1)]
+cons <- cons[,-c(1,dim(cons)[2])]
diff --git a/population_generation/messina_preprocess.py b/population_generation/messina_preprocess.py
index 7878533..06517d5 100644
--- a/population_generation/messina_preprocess.py
+++ b/population_generation/messina_preprocess.py
@@ -112,5 +112,6 @@ cons1['5'] = a5
cons1['f'] = cons['f']
cons1['m'] = cons['m']
cons1['total']=cons1.m+cons1.f
+cons1.index=["1_Circoscrizione","2_Circoscrizione","3_Circoscrizione","4_Circoscrizione","5_Circoscrizione","6_Circoscrizione"]
cons1.to_csv(os.sep.join([data_path,"cons.csv"]))
diff --git a/src/main/java/si/ijs/urbanite/simserver/simulation/SimulationRunService.java b/src/main/java/si/ijs/urbanite/simserver/simulation/SimulationRunService.java
index 1ebe1ac..8ad4a7b 100644
--- a/src/main/java/si/ijs/urbanite/simserver/simulation/SimulationRunService.java
+++ b/src/main/java/si/ijs/urbanite/simserver/simulation/SimulationRunService.java
@@ -72,7 +72,7 @@ public class SimulationRunService {
logger.info("running steps before simulation...");
runPythonPreprocess();
runRScript();
- if (this.city.equals("helsinki")){
+ if (this.city.equals("helsinki") && new File(ferriesToAddPath).exists()){
String new_ferries = new String(Files.readAllBytes(Paths.get(ferriesToAddPath)), StandardCharsets.UTF_8);
FileWriter fw = new FileWriter(ferriesPath,true);
fw.write(new_ferries);
--
GitLab