Skip to content

Commit

Permalink
Merge branch 'main' of github.com:JuliaStats/MixedModels.jl into pa/b…
Browse files Browse the repository at this point in the history
…enchmark_ci2
  • Loading branch information
palday committed Oct 2, 2023
2 parents dd6ebad + 0dc3993 commit deeaa25
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 37 deletions.
5 changes: 3 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ DataAPI = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
GLM = "38e38edf-8417-5370-95a0-9cbb8c7f171a"
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
MixedModelsDatasets = "7e9fb7ac-9f67-43bf-b2c8-96ba0796cbb6"
NLopt = "76087f3c-5699-56af-9a33-bf431cd00edd"
PooledArrays = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
Expand All @@ -36,12 +36,13 @@ DataAPI = "1"
Distributions = "0.21, 0.22, 0.23, 0.24, 0.25"
GLM = "1.8.2"
JSON3 = "1"
LazyArtifacts = "1"
MixedModelsDatasets = "0.1"
NLopt = "0.6, 1"
PooledArrays = "0.5, 1"
PrecompileTools = "1"
ProgressMeter = "1.7"
StaticArrays = "0.11, 0.12, 1"
Statistics = "1"
StatsAPI = "1.5"
StatsBase = "0.31, 0.32, 0.33, 0.34"
StatsFuns = "0.8, 0.9, 1"
Expand Down
3 changes: 1 addition & 2 deletions src/MixedModels.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ using DataAPI
using Distributions
using GLM
using JSON3
using LazyArtifacts
using LinearAlgebra
using Markdown
using NLopt
Expand All @@ -27,6 +26,7 @@ using LinearAlgebra: BlasFloat, BlasReal, HermOrSym, PosDefException, copytri!
using Base: Ryu, require_one_based_indexing
using DataAPI: levels, refpool, refarray, refvalue
using GLM: Link, canonicallink, linkfun, linkinv, dispersion, dispersion_parameter
using MixedModelsDatasets: dataset, datasets
using NLopt: Opt
using StatsModels: TableRegressionModel
using StatsFuns: log2π, normccdf
Expand Down Expand Up @@ -164,7 +164,6 @@ abstract type MixedModel{T} <: StatsModels.RegressionModel end # model with fixe
include("utilities.jl")
include("blocks.jl")
include("pca.jl")
include("datasets.jl")
include("arraytypes.jl")
include("varcorr.jl")
include("Xymat.jl")
Expand Down
33 changes: 0 additions & 33 deletions src/datasets.jl

This file was deleted.

0 comments on commit deeaa25

Please sign in to comment.