Dev (#30)

* some refactoring

* pretty printing

* some updates for resettablerng

* deepcopy on iterate

* Move ResettableRNG to MeasureTheory

* Make Pretty a const

* drop extra spaces

* formatting

* formatting

* formatting

* add DensityInterface dependency

* faster `rootmeasure`

* updates

* primitive measure docs

* get tests passing

* cleaning up

* formatting

* drop some unneeded methods

* update for DensityInterface

* updating densities to DensityInterface approach

* update domains

* moving things around

* updates to IntegerBounds

* more domain mucking

* fix some exports

* update deps

* update `using`

* working on tests

* Working toward tests passing

* some refactoring

* working on tests

* cleaning up

* get tests to pass

* tests passing

* update logdensity_def for pointwise product

* PrettyPrinting + tests

* speed up `rootmeasure`

* oops didn't mean to include that

* tile(::FactoredBase)

* Update Half and FactoredBase

* drop exp.jl

* simplify basemeasure

* drop old `include`

* drop redundant method

* update compat Returns

* add AbstractDensity

* Move Affine to MeasureTheory

* drop some old `For` code

* update counting measure

* add testvalue(::Type{T})

* bugfix

* some dispatch adjustments

* simplify show

* formatting

* transformed measures

* ZeroSets

* using LinearAlgebra, Statistics

* working on MeasureTheory tests

* updates

* updates

* typo

* update default to mimic Base

* fix tile(::Lebesgue)

* Add test_interface function

* small doc update

* DensityKind(::Likelihood)

* fixing show(::Likelihood)

* adding some docs

* update `rand` method

* drop old integration code

* add `rebase`

* export rebase

* law for ⊗

* typo

* Make Likelihood more flexible

* update kernel methods

* add Likelihood method (avoid stack overflow)

* refactoring

* compat

* Maybe Comat just works?

* refactoring

* some new stuff

* working on tests

* update powermeasure combinator

* bugfix

* comment out debugging lines

* more refactoring

* test @inferred basemeasure_depth(μ)

* drop `constructor` (just use ConstructionBase.constructorof`)

* debugging

* update help

* update interface

* make tests harder

* fixes

* Dirac bugfix

* formatting

* improve type inference

* working on type inference

* update interface

* udpates

* get test passing

* @test !isabstracttype(typejoin(...))

* work on show methods

* update CI

* remove old code

* update productmeasure

* prettyprinting stuff

* Drop te @constprop :aggressive stuff (maybe don't need it?)

* nerline

* dropping some old code

* update tbasemeasure_type(::PowerMeasure)

* moar tests

* update SpikeMixture

* update superpose type parameter name

* drop old tests

* func_string

* more updates

* getting closer

* almost there!

* generated function for type stability

* tests passing!

* newline

* more fixes

* exports and bugfix

* insupport(μ::Counting{T}, x) where {T<:Type}

* working on MeasureTheory tests

* MeasureTheory tests passing

* drop some old code

* inlining

* improve inference

* update `tile(::For)`

* tighten down infrerence

* update basemeasure(::For) for generators

* loosen type bound on instance_type

* drop debugging code

* small update for Likelihood, and a test

* fixing up likelihoods

* improve `basemeasure_depth` dispatch

* still some trouble with inferred basemeasure_depth

* clean up `For` dispatch

* simplify _logdensityof

* optimize for Returns{True} case

* rework basemeasure_depth

* aggressive tests passing!!

* drop type-level stuff

* drop help

* license

* affero

* copyright notice

Author: cscherrer

.JuliaFormatter.toml

@@ -0,0 +1,20 @@
+indent = 4
+margin = 92
+always_for_in = true
+whitespace_typedefs = false
+whitespace_ops_in_indices = false
+remove_extra_newlines = true
+import_to_using = false
+pipe_to_function_call = false
+short_to_long_function_def = false
+always_use_return = false
+whitespace_in_kwargs = true
+annotate_untyped_fields_with_any = false
+format_docstrings = false
+align_struct_field = true
+align_conditional = true
+align_assignment = true
+align_pair_arrow = true
+conditional_to_if = true
+normalize_line_endings = "unix"
+align_matrix = false

.github/workflows/CI.yml

@@ -12,8 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.3'
           - '1.6'
+          - '1.7'
           - 'nightly'
         os:
           - ubuntu-latest

COPYRIGHT

@@ -0,0 +1,45 @@
+Copyright (c) 2022 Informative Prior, LLC
+Copyright (c) 2022 Chad Scherrer
+ 
+This program is offered under a commercial and under the AGPL license.
+For commercial licensing, contact us.  For AGPL licensing, see below.
+
+AGPL licensing:
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/agpl-3.0.en.html>. 
+
+This file incorporates work covered by the following copyright and  
+permission notice:  
+
+    MIT License
+
+    Copyright (c) 2020-2021 Chad Scherrer <chad.scherrer@gmail.com> and contributors
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+

LICENSE

@@ -4,27 +4,31 @@ authors = ["Chad Scherrer <chad.scherrer@gmail.com> and contributors"]
 version = "0.5.1"
 
 [deps]
-ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
+Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
+DensityInterface = "b429d917-457f-4dbc-8f4c-0cc954292b1d"
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
-KeywordCalls = "4d827475-d3e4-43d6-abe3-9688362ede9f"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LogExpFunctions = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
-MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
 MappedArrays = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
 PrettyPrinting = "54e16d92-306c-5ea0-a30b-337be88ac337"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
+Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
+Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Tricks = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"
 
 [compat]
-ConcreteStructs = "0.2"
+Compat = "3.35"
 ConstructionBase = "1.3"
+DensityInterface = "0.4"
 FillArrays = "0.12"
-KeywordCalls = "0.2"
 LogExpFunctions = "0.3"
-MLStyle = "0.4"
 MappedArrays = "0.4"
 PrettyPrinting = "0.3"
+Reexport = "1"
+Static = "0.4"
 Tricks = "0.1"
 julia = "1.3"
 

Project.toml

@@ -5,4 +5,6 @@
 [![Build Status](https://github.com/cscherrer/MeasureBase.jl/workflows/CI/badge.svg)](https://github.com/cscherrer/MeasureBase.jl/actions)
 [![Coverage](https://codecov.io/gh/cscherrer/MeasureBase.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/cscherrer/MeasureBase.jl)
 
+<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
+
 This package is a lightweight version of [MeasureTheory](https://github.com/cscherrer/MeasureTheory.jl). It contains only the basic functionalities needed to define and use measures.

README.md

@@ -4,84 +4,112 @@ const logtwo = log(2.0)
 
 using Random
 import Random: rand!
+import Random: gentype
+using Statistics
+using LinearAlgebra
+
+import DensityInterface: logdensityof
+import DensityInterface: densityof
+import DensityInterface: DensityKind
+using DensityInterface
+
+import ConstructionBase
+using ConstructionBase: constructorof
+
+using PrettyPrinting
+const Pretty = PrettyPrinting
 
 using FillArrays
-using ConcreteStructs
-using MLStyle
+using Static
 
 export ≪
-export sampletype
+export gentype
+export rebase
 
 export AbstractMeasure
 
 abstract type AbstractMeasure end
 
-import PrettyPrinting
+using Static: @constprop
 
-const Pretty = PrettyPrinting
+function Pretty.tile(d::M) where {M<:AbstractMeasure}
+    the_names = fieldnames(typeof(d))
+    result = Pretty.literal(repr(M))
+    isempty(the_names) && return result * Pretty.literal("()")
+    Pretty.list_layout(Pretty.tile.([getfield(d, n) for n in the_names]); prefix=result)
+end
 
-sampletype(μ::AbstractMeasure) = typeof(testvalue(μ))
+@inline DensityKind(::AbstractMeasure) = HasDensity()
 
-# sampletype(μ::AbstractMeasure) = sampletype(basemeasure(μ))
+gentype(μ::AbstractMeasure) = typeof(testvalue(μ))
 
-export logdensity
+# gentype(μ::AbstractMeasure) = gentype(basemeasure(μ))
+
+export logdensity_def
 export basemeasure
-export basekernel
+export basekleisli
 
 using LogExpFunctions: logsumexp
 
 """
-    logdensity(μ::AbstractMeasure{X}, x::X)
+    logdensity_def(μ::AbstractMeasure{X}, x::X)
 
 Compute the logdensity of the measure μ at the point x. This is the standard way
 to define `logdensity` for a new measure. the base measure is implicit here, and
 is understood to be `basemeasure(μ)`.
 
 Methods for computing density relative to other measures will be
 """
-function logdensity end
-
-if VERSION < v"1.7.0-beta1.0"
-    @eval begin
-        struct Returns{T}
-            value::T
-        end
+function logdensity_def end
 
-        (f::Returns)(x) = f.value
-    end
-end
+using Compat
 
-include("kernel.jl")
+include("proxies.jl")
+include("kleisli.jl")
 include("parameterized.jl")
-include("combinators/mapsto.jl")
 include("combinators/half.jl")
-include("exp.jl")
 include("domains.jl")
+include("primitive.jl")
 include("utils.jl")
 include("absolutecontinuity.jl")
-include("macros.jl")
 
-include("primitive.jl")
 include("primitives/counting.jl")
 include("primitives/lebesgue.jl")
 include("primitives/dirac.jl")
 include("primitives/trivial.jl")
 
+include("combinators/bind.jl")
+include("combinators/transformedmeasure.jl")
 include("combinators/factoredbase.jl")
 include("combinators/weighted.jl")
 include("combinators/superpose.jl")
 include("combinators/product.jl")
 include("combinators/for.jl")
 include("combinators/power.jl")
-include("combinators/affine.jl")
 include("combinators/spikemixture.jl")
 include("combinators/likelihood.jl")
 include("combinators/pointwise.jl")
 include("combinators/restricted.jl")
 include("combinators/smart-constructors.jl")
+include("combinators/conditional.jl")
 
 include("rand.jl")
 
 include("density.jl")
+module Interface
 
-end
+using Reexport
+using MeasureBase
+using MeasureBase:basemeasure_depth, proxy
+@reexport using Test
+
+export test_interface
+export basemeasure_depth
+export proxy
+
+include("interface.jl")
+end # module Interface
+
+using .Interface
+
+end # module MeasureBase