some fix for julia installation and a fix in the rebuild of the objevtive function by normL2_indiv()

SeverinBang · SeverinBang · commit 02a5078f2d2f · 2025-01-30T10:14:12.000+01:00
diff --git a/R/normIndiv.R b/R/normIndiv.R
@@ -505,7 +505,7 @@ normL2_indiv <- function (data, prd0, errmodel = NULL, est.grid, fix.grid, times
   })
   if (!is.null(times)){ 
     timesD <- sort(unique(c(0, do.call(c, lapply(data, function(d) d$time)))))
-    timesD <- lapply(1:length(data), function(i) sort(union(times, timesD)))
+    timesD <- lapply(1:length(data), function(i) sort(union(times[[i]], timesD)))
     names(timesD) <- names(data)
   }  
   x.conditions <- est.grid$condition
diff --git a/R/toolsSeverin.R b/R/toolsSeverin.R
@@ -643,6 +643,7 @@ installJuliaForSteadyStates <- function(installJulia = FALSE, installJuliaPackag
   if (installJulia) {
     system("sh -i ~/.JuliaSteadyStates/installJuliaUp.sh -y")
     system("juliaup add release")
+    try(system("source ~/.bashrc"))
   }
   
   if (installJuliaPackages) {

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ normL2_indiv <- function (data, prd0, errmodel = NULL, est.grid, fix.grid, times`
`505`	`505`	`})`
`506`	`506`	`if (!is.null(times)){`
`507`	`507`	`timesD <- sort(unique(c(0, do.call(c, lapply(data, function(d) d$time)))))`
`508`		`- timesD <- lapply(1:length(data), function(i) sort(union(times, timesD)))`
	`508`	`+ timesD <- lapply(1:length(data), function(i) sort(union(times[[i]], timesD)))`
`509`	`509`	`names(timesD) <- names(data)`
`510`	`510`	`}`
`511`	`511`	`x.conditions <- est.grid$condition`
Original file line number	Diff line number	Diff line change
`@@ -643,6 +643,7 @@ installJuliaForSteadyStates <- function(installJulia = FALSE, installJuliaPackag`
`643`	`643`	`if (installJulia) {`
`644`	`644`	`system("sh -i ~/.JuliaSteadyStates/installJuliaUp.sh -y")`
`645`	`645`	`system("juliaup add release")`
	`646`	`+ try(system("source ~/.bashrc"))`
`646`	`647`	`}`
`647`	`648`
`648`	`649`	`if (installJuliaPackages) {`