solved conflicts

Merge branch 'master' of github.com:EricMarcon/dbmss

# Conflicts:
#	R/KEnvelope.R
#	R/KdEnvelope.R
#	R/KinhomEnvelope.R
#	R/Smooth.wmppp.R
#	R/gEnvelope.R
#	R/generic.spatstat.R
#	R/rPopulationIndependenceK.R

R/KinhomEnvelope.R

@@ -8,7 +8,7 @@ KinhomEnvelope <- function(
     SimulationType = "RandomPosition",
     Global = FALSE, 
     verbose = interactive()) {
-
+  
   CheckdbmssArguments()
 
   # Estimate intensity if it has not been provided.
@@ -25,7 +25,7 @@ KinhomEnvelope <- function(
   }
 
   # Choose the null hypothesis
-  SimulatedPP <- switch(
+  SimulatedPP <- switch (
     SimulationType,
     RandomPosition = expression(rpoispp(lambda)),
     RandomLocation = expression(rRandomLocation(X, CheckArguments = FALSE)),
@@ -66,13 +66,15 @@ KinhomEnvelope <- function(
       savefuns = TRUE
     )
   )
-  attr(Envelope, "einfo")$H0 <- switch(
+  attr(Envelope, "einfo")$H0 <- switch (
     SimulationType,
     RandomPosition = "Random Position",
     RandomLocation = "Random Location",
+    RandomLabeling = "Random Labeling",
+    PopulationIndependence = "Population Independence"
   )
   # Calculate confidence intervals
   Envelope <- FillEnvelope(Envelope, Alpha = Alpha, Global = Global)
   # Return the envelope
   return (Envelope)
-}
+}

R/Smooth.wmppp.R

@@ -85,7 +85,7 @@ Smooth.wmppp <- function(
     # Smooth the values of the dbm
     fvind.matrix <- as.matrix(fvind)
     # Extract the values. Columns 1 to 3 contain the global dbm
-    marks(X) <- fvind.matrix [which(fvind.matrix[, 1] == r_to_plot), -(1:3)]
+    marks(X) <- fvind.matrix[which(fvind.matrix[, 1] == r_to_plot), -(1:3)]
     # Smooth requires the top class of X to be ppp
     class(X) <- "ppp"
     # Eliminate NA's before smoothing