diff --git a/population_generation/helsinki_population.R b/population_generation/helsinki_population.R index d7155719b0b4f685b59c0b5136ad394f6ee37277..7d943d602989877f663536fbc584ebe57298c623 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 331d09d4a0467685cb610e0bf4956aa481306f69..7c8d53a430985dd1d95a0e636b31318371dd7c67 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 7878533549df1b324ae64242724db389a54d0640..06517d51a03169f6eec881b2e4394b68aa3888dd 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 1ebe1ac23d9b1d34bb0114fb9ddd0c2acc769423..8ad4a7b84a5de272501fa2fab18eb69148a47671 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);