Changed behavior of log(gamma(x))

NAMESPACE

@@ -1,3 +1,5 @@
 # Generated by roxygen2: do not edit by hand
 
+export(admix1)
+export(calculatePopLogml)
 export(learn_simple_partition)

R/calculatePopLogml.R

@@ -4,16 +4,17 @@
 #' for the mean parameter.
 #' @param points points
 #' @param fii fii
+#' @export
 calculatePopLogml <- function(points, fii) {
     n <- length(points)
     fuzzy_ones <- sum(points)
     fuzzy_zeros <- n - fuzzy_ones
-    val = log(gamma(1)) -
+    val <- log_gamma(1) -
-        log(gamma(1 + n / fii)) +
+        log_gamma(1 + n / fii) +
-        log(gamma(0.5 + fuzzy_ones / fii)) +
+        log_gamma(0.5 + fuzzy_ones / fii) +
-        log(gamma(0.5 + fuzzy_zeros / fii)) -
+        log_gamma(0.5 + fuzzy_zeros / fii) -
-        log(gamma(0.5)) -
+        log_gamma(0.5) -
-        log(gamma(0.5))
+        log_gamma(0.5)
     return(val)
 }
 

R/log_gamma.R

@@ -0,0 +1,8 @@
+#' @title Log Gamma
+#' @description Equal to log(gamma(x)) with special handling of x < 0 for 
+#' Matlab compatibility
+#' @param x number
+#' @return log(gamma(x)) for x > 0, Inf otherwise
+log_gamma <- function(x) {
+    ifelse(x > 0, log(gamma(x)), Inf)
+}

man/log_gamma.Rd

@@ -0,0 +1,18 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/log_gamma.R
+\name{log_gamma}
+\alias{log_gamma}
+\title{Log Gamma}
+\usage{
+log_gamma(x)
+}
+\arguments{
+\item{x}{number}
+}
+\value{
+log(gamma(x)) for x > 0, Inf otherwise
+}
+\description{
+Equal to log(gamma(x)) with special handling of x < 0 for 
+Matlab compatibility
+}