Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
demsarjure committed Sep 29, 2023
2 parents c6a6083 + 007ab8a commit 483cf70
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Version: 1.2.11
Date: 2023-03-22 19:58:11 UTC
SHA: ebd5258c187e9b08ce60238e50168d25c2b5e910
Version: 1.2.12
Date: 2023-09-29 12:32:54 UTC
SHA: 3564186c5c9464a9107af82d962456848a8e9dd1
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: bayes4psy
Version: 1.2.11
Version: 1.2.12
Title: User Friendly Bayesian Data Analysis for Psychology
Description: Contains several Bayesian models for data analysis of psychological tests. A user friendly interface for these models should enable students and researchers to perform professional level Bayesian data analysis without advanced knowledge in programming and Bayesian statistics. This package is based on the Stan platform (Carpenter et el. 2017 <doi:10.18637/jss.v076.i01>).
Authors@R:
Expand Down
14 changes: 7 additions & 7 deletions inst/stan/color.stan
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
data {
int<lower=0> n; // number of data entries
// rgb
array[n] real<lower=0,upper=255> r;
array[n] real<lower=0,upper=255> g;
array[n] real<lower=0,upper=255> b;
vector<lower=0,upper=255>[n] r;
vector<lower=0,upper=255>[n] g;
vector<lower=0,upper=255>[n] b;
// hsv
array[n] real<lower=0,upper=2*pi()> h;
array[n] real<lower=0,upper=1> s;
array[n] real<lower=0,upper=1> v;
vector<lower=0,upper=2*pi()>[n] h;
vector<lower=0,upper=1>[n] s;
vector<lower=0,upper=1>[n] v;

// priors
array[12] int<lower=0> p_ids;
array[24] real p_values;
vector[24] p_values;
}

parameters {
Expand Down
2 changes: 1 addition & 1 deletion inst/stan/linear.stan
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ data {

// priors
array[6] int<lower=0> p_ids;
array[12] real p_values;
vector[12] p_values;
}

parameters {
Expand Down
2 changes: 1 addition & 1 deletion inst/stan/reaction_time.stan
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ data {

// priors
array[6] int p_ids;
array[12] real p_values;
vector[12] p_values;
}

parameters {
Expand Down
4 changes: 2 additions & 2 deletions inst/stan/ttest.stan
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
data {
int<lower=0> n; // number of samples
array[n] real y;
vector[n] y;

// priors
array[3] int<lower=0> p_ids;
array[6] real p_values;
vector[6] p_values;
}

parameters {
Expand Down

0 comments on commit 483cf70

Please sign in to comment.