Skip to content

Commit

Permalink
Merge branch 'main' into be_positive
Browse files Browse the repository at this point in the history
  • Loading branch information
palday authored Nov 9, 2023
2 parents c862242 + fe3b36a commit 7f81887
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
run: julia -e 'using CompatHelper; CompatHelper.main()'
run: julia -e 'using CompatHelper; CompatHelper.main(; bump_version=true)'
2 changes: 1 addition & 1 deletion .github/workflows/Tier1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix:
julia-version: [1]
julia-arch: [x64]
os: [ubuntu-18.04, macos-10.15, windows-2019]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/Tier2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@ jobs:
matrix:
julia-version: [1.6, nightly]
julia-arch: [x64]
os: [ubuntu-18.04]
exclude:
- julia-version: 1.3
julia-arch: x64
- os: macos-10.15
julia-arch: x86
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/docs-cleanup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# remove PR previews once they're merged
# <https://juliadocs.github.io/Documenter.jl/dev/man/hosting/#gh-pages-Branch>
name: Doc Preview Cleanup
on:
pull_request:
types: [closed]
jobs:
doc-preview-cleanup:
runs-on: ubuntu-latest
steps:
- name: Checkout gh-pages branch
uses: actions/checkout@v2
with:
ref: gh-pages
- name: Delete preview and history + push changes
run: |
if [ -d "previews/PR$PRNUM" ]; then
git config user.name "Documenter.jl"
git config user.email "documenter@juliadocs.github.io"
git rm -rf "previews/PR$PRNUM"
git commit -m "delete preview"
git branch gh-pages-new $(echo "delete history" | git commit-tree HEAD^{tree})
git push --force origin gh-pages-new:gh-pages
fi
env:
PRNUM: ${{ github.event.number }}
23 changes: 23 additions & 0 deletions .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# adapted from https://github.com/JuliaDocs/Documenter.jl/blob/master/.github/workflows/SpellCheck.yml
# see docs at https://github.com/crate-ci/typos
name: Spell Check
on: [pull_request]

jobs:
typos-check:
name: Spell Check with Typos
runs-on: ubuntu-latest
steps:
- name: Checkout Actions Repository
uses: actions/checkout@v4
- name: Check spelling
uses: crate-ci/typos@master
# don't fail on typos in files not impacted by this PR
continue-on-error: true
with:
config: _typos.toml
write_changes: true
- uses: reviewdog/action-suggester@v1
with:
tool_name: Typos
fail_on_error: true
6 changes: 4 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MixedModelsSim"
uuid = "d5ae56c5-23ca-4a1f-b505-9fc4796fc1fe"
authors = ["Phillip Alday", "Douglas Bates", "Lisa DeBruine", "Reinhold Kliegl"]
version = "0.2.6"
version = "0.2.8"

[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Expand All @@ -13,8 +13,10 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"

[compat]
LinearAlgebra = "1"
MixedModels = "4"
PooledArrays = "0.5, 1"
PrettyTables = "0.11, 0.12, 1"
PrettyTables = "0.11, 0.12, 1, 2"
Statistics = "1"
Tables = "1.0"
julia = "1.3"
20 changes: 20 additions & 0 deletions _typos.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# https://github.com/crate-ci/typos#false-positives
[default]

[default.extend-identifiers]
Lik = "Lik"
missings = "missings"

[default.extend-words]
Lik = "Lik"
missings = "missings"

[type.package_toml]
# Don't check spellings in these files
extend-glob = ["Manifest.toml", "Project.toml"]
check-file = false

[type.bib]
# contain lots of names, which are a great spot for false positives
extend-glob = ["*.bib"]
check-file = false
4 changes: 2 additions & 2 deletions docs/src/simulation_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ The meaning of `θ` is a bit less intuitive. In a less complex model (one that o
In our `kb07_m` example:
- The `residual` standard deviation is `680.032`.
- The standard deviation of our first variance component *`item (Intercept)`* is `364.713`.
- Thus our first `θ` is the relationship: variance component devided by `residual` standard deviation: ``364.713 / 680.032 = 0.53631``
- Thus our first `θ` is the relationship: variance component divided by `residual` standard deviation: ``364.713 / 680.032 = 0.53631``

```@example Main
kb07_m.θ
Expand All @@ -284,7 +284,7 @@ kb07_m.θ
We also can calculate the `θ` for variance component *`subj (Intercept)`*.
The `residual` standard deviation is `680.032`.
The standard deviation of our variance component *`subj (Intercept)`* is `298.026`.
Thus, the related θ is the relationship: variance component devided by `residual` standard deviation
Thus, the related θ is the relationship: variance component divided by `residual` standard deviation
298.026 / 680.032 = `0.438252`

We can not calculate the `θ`s for variance component *`item prec: break`* this way, because it includes the correlation of
Expand Down
8 changes: 4 additions & 4 deletions docs/src/simulation_tutorial_pluto.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ begin
using DataFrames, Tables # work with data tables
using StableRNGs # random number generator
using CSV # write CSV files
using Statistics # basic math funcions
using Statistics # basic math functions
using DataFramesMeta # dplyr-like operations
using Gadfly # plotting package
using PlutoUI
Expand Down Expand Up @@ -59,7 +59,7 @@ For the first example we are going to simulate bootstrapped data from an existin
*Experiment 2 from Kronmüller, E., & Barr, D. J. (2007). Perspective-free pragmatics: Broken precedents and the recovery-from-preemption hypothesis. Journal of Memory and Language, 56(3), 436-455.*
The data we will be using through out this tutorial is a study about how in a conversation the change of a speaker or the change of precedents (which are patterns of word usage to discribe an object, e.g. one can refer to the same object "white shoes", "runners", "sneakers") affects the understanding.
The data we will be using through out this tutorial is a study about how in a conversation the change of a speaker or the change of precedents (which are patterns of word usage to describe an object, e.g. one can refer to the same object "white shoes", "runners", "sneakers") affects the understanding.
Objects are presented on a screen while participants listen to instructions to move the objects around. Participants eye movements are tracked.
The dependent variable is response time, defined as the latency between the onset of the test description and the moment at which the target was selected.
Expand Down Expand Up @@ -335,7 +335,7 @@ The meaning of `θ` is a bit less intuitive. In a less complex model (one that o
In our `kb07_m` example:
The `residual` standard deviation is `680.032`.
The standard deviation of our first variance component *`item - (Intercept)`* is `364.713`.
Thus our first `θ` is the relationship: variance component devided by `residual` standard deviation
Thus our first `θ` is the relationship: variance component divided by `residual` standard deviation
364.713 / 680.032 = `0.53631`
"""

Expand All @@ -347,7 +347,7 @@ md"""
We also can calculate the `θ` for variance component *`subj - (Intercept)`*.
The `residual` standard deviation is `680.032`.
The standard deviation of our variance component *`subj - (Intercept)`* is `298.026`.
Thus, the related θ is the relationship: variance component devided by `residual` standard deviation
Thus, the related θ is the relationship: variance component divided by `residual` standard deviation
298.026 / 680.032 = `0.438252`
"""

Expand Down

0 comments on commit 7f81887

Please sign in to comment.