Std Measures (#61)

cscherrer · web-flow · commit bbae5401acba · 2022-06-14T15:04:54.000-07:00
* drop testvalue from proxy stuff

* Std stuff

* include stdmeasure

* formatting

* formatting

* typeo(f)

* version bump
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MeasureBase"
 uuid = "fa1605e6-acd5-459c-a1e6-7e635759db14"
 authors = ["Chad Scherrer <chad.scherrer@gmail.com> and contributors"]
-version = "0.9.4"
+version = "0.9.5"
 
 [deps]
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
diff --git a/src/MeasureBase.jl b/src/MeasureBase.jl
@@ -124,6 +124,7 @@ include("combinators/smart-constructors.jl")
 include("combinators/powerweighted.jl")
 include("combinators/conditional.jl")
 
+include("standard/stdmeasure.jl")
 include("standard/stdnormal.jl")
 include("standard/stduniform.jl")
 include("standard/stdexponential.jl")
diff --git a/src/proxies.jl b/src/proxies.jl
@@ -19,7 +19,5 @@ macro useproxy(M)
         @inline $MeasureBase.basemeasure(μ::$M) = basemeasure(proxy(μ))
 
         @inline $MeasureBase.basemeasure_depth(μ::$M) = basemeasure_depth(proxy(μ))
-
-        @inline $MeasureBase.testvalue(μ::$M) = testvalue(proxy(μ))
     end
 end
diff --git a/src/standard/stdexponential.jl b/src/standard/stdexponential.jl
@@ -1,4 +1,4 @@
-struct StdExponential <: AbstractMeasure end
+struct StdExponential <: StdMeasure end
 
 export StdExponential
 
diff --git a/src/standard/stdmeasure.jl b/src/standard/stdmeasure.jl
@@ -0,0 +1,5 @@
+abstract type StdMeasure <: AbstractMeasure end
+
+StdMeasure(::typeof(rand)) = StdUniform()
+StdMeasure(::typeof(randn)) = StdNormal()
+StdMeasure(::typeof(randexp)) = StdExponential()
diff --git a/src/standard/stdnormal.jl b/src/standard/stdnormal.jl
@@ -1,4 +1,4 @@
-struct StdNormal <: AbstractMeasure end
+struct StdNormal <: StdMeasure end
 
 export StdNormal
 
diff --git a/src/standard/stduniform.jl b/src/standard/stduniform.jl
@@ -1,4 +1,4 @@
-struct StdUniform <: AbstractMeasure end
+struct StdUniform <: StdMeasure end
 
 export StdUniform
 
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -37,23 +37,20 @@ test_measures = [
     Dirac(0) + Dirac(1)
     Dirac(0.0) + Lebesgue(ℝ)
     SpikeMixture(Lebesgue(ℝ), 0.2)
-
     StdNormal()
     StdNormal()^3
     StdNormal()^(2, 3)
     3 * StdNormal()
     0.2 * StdNormal() + 0.8 * Dirac(0.0)
     Dirac(0.0) + StdNormal()
     SpikeMixture(StdNormal(), 0.2)
-
     StdUniform()
     StdUniform()^3
     StdUniform()^(2, 3)
     3 * StdUniform()
     0.2 * StdUniform() + 0.8 * Dirac(0.0)
     Dirac(0.0) + StdUniform()
     SpikeMixture(StdUniform(), 0.2)
-
     StdExponential()^3
     StdExponential()^(2, 3)
     3 * StdExponential()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-struct StdExponential <: AbstractMeasure end`
	`1`	`+struct StdExponential <: StdMeasure end`
`2`	`2`
`3`	`3`	`export StdExponential`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-struct StdNormal <: AbstractMeasure end`
	`1`	`+struct StdNormal <: StdMeasure end`
`2`	`2`
`3`	`3`	`export StdNormal`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-struct StdUniform <: AbstractMeasure end`
	`1`	`+struct StdUniform <: StdMeasure end`
`2`	`2`
`3`	`3`	`export StdUniform`
`4`	`4`