Merge branch 'Sequential' of gitlab.idiv.de:sPlot/hidden into Sequential

cli_01b.r

@@ -88,9 +88,9 @@ cli <- parse_args(parser, positional_arguments = 5)
 # ------------------------------------------------------------------------------
 
 species.path   <- cli$args[1]
-traits.path  	 <- cli$args[2]
-output  	     <- cli$args[3]
-myfunction   	 <- cli$args[4]
+traits.path  <- cli$args[2]
+output       <- cli$args[3]
+myfunction   <- cli$args[4]
 combinations   <- cli$args[5]
 start.round    <- cli$options$start.round
 start.round    <- cli$options$relax.round
@@ -105,6 +105,6 @@ ncores         <- cli$options$ncores
 # ------------------------------------------------------------------------------
 
 source("01b_MesobromionCluster.R")
-
+<<<<<<< HEAD
 Mesobromion(species.path, traits.path, output, myfunction, combinations, start.round, relax.round,
-            max.inter.t, chunkn, chunk.i, nperm, ncores)
+>>>>>>> 8a43e44028ed18129c0ddc708e41bbedf1cd9177