Merge pull request #21 from Vaibhavdixit02/editbranch1

Tests and fix some errors of stan_string

src/stan_string.jl

@@ -9,8 +9,8 @@ function stan_string(p::Union{Type{Bernoulli},Bernoulli})
 end
 function stan_string(p::Union{Type{Binomial},Binomial})
 	try
-		parameters = (params(p)[1])
-		return string("binomial($parameters)")
+		parameters = (params(p)[1],params(p)[2])
+		return string("binomial$parameters")
 	catch
 		return string("binomial")
 	end
@@ -25,8 +25,8 @@ function stan_string(p::Union{Type{BetaBinomial},BetaBinomial})
 end
 function stan_string(p::Union{Type{Hypergeometric},Hypergeometric})
 	try
-		parameters = (params(p)[1])
-		return string("hypergeometric($parameters)")
+		parameters = (params(p)[1],params(p)[2],params(p)[3])
+		return string("hypergeometric$parameters")
 	catch
 		return string("hypergeometric")
 	end
@@ -50,17 +50,17 @@ end
 function stan_string(p::Union{Type{Poisson},Poisson})
 	try
 		parameters = (params(p)[1])
-		return string("beta_binomial($parameters)")
+		return string("poisson($parameters)")
 	catch
-		return string("beta_binomial")
+		return string("poisson")
 	end
 end
 function stan_string(p::Union{Type{Normal},Normal})
 	try
 		parameters = (params(p)[1],params(p)[2])
-		string("normal$parameters")
+		return string("normal$parameters")
 	catch
-		string("normal")
+		return string("normal")
 	end
 end
 function stan_string(p::Union{Type{TDist},TDist}) 
@@ -177,7 +177,7 @@ function stan_string(p::Union{Type{Pareto},Pareto})
 end
 function stan_string(p::Union{Type{GeneralizedPareto},GeneralizedPareto}) 
 	try
-		parameters = (params(p)[1],params(p)[2])
+		parameters = (params(p)[1],params(p)[2],params(p)[3])
 		return string("pareto_type_2$parameters")
 	catch
 		return string("pareto_type_2")

test/runtests.jl

@@ -2,6 +2,7 @@ using DiffEqBayes
 using Base.Test
 
 tic()
+@time @testset "Stan_String" begin include("stan_string.jl") end
 @time @testset "Stan" begin include("stan.jl") end
 #@time @testset "Turing" begin include("turing.jl") end # Doesn't work on v0.6
 toc()

test/stan_string.jl

@@ -0,0 +1,77 @@
+using Distributions,DiffEqBayes
+
+println("Starting the test")
+@test stan_string(Bernoulli(1)) == "bernoulli(1.0)"
+@test stan_string(Bernoulli) == "bernoulli"
+
+@test stan_string(Binomial(5,0.3)) == "binomial(5, 0.3)"
+@test stan_string(Binomial) == "binomial"
+
+@test stan_string(BetaBinomial(5,1,1)) == "beta_binomial(5, 1.0, 1.0)"
+@test stan_string(BetaBinomial) == "beta_binomial"
+
+@test stan_string(Hypergeometric(5,5,3)) == "hypergeometric(5, 5, 3)"
+@test stan_string(Hypergeometric) == "hypergeometric"
+
+@test stan_string(NegativeBinomial(5,0.3)) == "neg_binomial(5.0, 0.3)"
+@test stan_string(NegativeBinomial) == "neg_binomial"
+
+@test stan_string(Poisson(5)) == "poisson(5.0)"
+@test stan_string(Poisson) == "poisson"
+
+@test stan_string(Normal(0,1)) == "normal(0.0, 1.0)"
+@test stan_string(Normal) == "normal"
+
+@test stan_string(TDist(5)) == "student_t(5.0,0,1)"
+@test stan_string(TDist) == "student_t"
+
+@test stan_string(Cauchy(0,1)) == "cauchy(0.0, 1.0)"
+@test stan_string(Cauchy) == "cauchy"
+
+@test stan_string(Laplace(0,1)) == "double_exponential(0.0, 1.0)"
+@test stan_string(Laplace) == "double_exponential"
+
+@test stan_string(Logistic(0,1)) == "logistic(0.0, 1.0)"
+@test stan_string(Logistic) == "logistic"
+
+@test stan_string(Gumbel(0,1)) == "gumbel(0.0, 1.0)"
+@test stan_string(Gumbel) == "gumbel"
+
+@test stan_string(LogNormal(0,1)) == "lognormal(0.0, 1.0)"
+@test stan_string(LogNormal) == "lognormal"
+
+@test stan_string(Chisq(5)) == "chi_square(5.0)"
+@test stan_string(Chisq) == "chi_square"
+
+@test stan_string(Exponential(5)) == "exponential(5.0)"
+@test stan_string(Exponential) == "exponential"
+
+@test stan_string(Gamma(2,3)) == "gamma(2.0, 3.0)"
+@test stan_string(Gamma) == "gamma"
+
+@test stan_string(InverseGamma(2,3)) == "inv_gamma(2.0, 3.0)"
+@test stan_string(InverseGamma) == "inv_gamma"
+
+@test stan_string(Weibull(1,1)) == "weibull(1.0, 1.0)"
+@test stan_string(Weibull) == "weibull"
+
+@test stan_string(Frechet(1,1)) =="frechet(1.0, 1.0)"
+@test stan_string(Frechet) == "frechet"
+
+@test stan_string(Rayleigh(5)) == "rayleigh(5.0)"
+@test stan_string(Rayleigh) == "rayleigh"
+
+@test stan_string(Pareto(2,3)) == "pareto(2.0, 3.0)"
+@test stan_string(Pareto) == "pareto"
+
+@test stan_string(GeneralizedPareto(0,1,2)) == "pareto_type_2(0.0, 1.0, 2.0)"
+@test stan_string(GeneralizedPareto) == "pareto_type_2"
+
+@test stan_string(Beta(3,3)) == "beta(3.0, 3.0)"
+@test stan_string(Beta) == "beta"
+
+@test stan_string(Uniform(1,4)) =="uniform(1.0, 4.0)"
+@test stan_string(Uniform) == "uniform"
+
+@test stan_string(VonMises(0,2)) == "von_mises(0.0, 2.0)"
+@test stan_string(VonMises) == "von_mises"