Updating of Frequency analysis #1
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updating of Frequency analysis
jonathon-love
added a commit
that referenced
this pull request
Jul 29, 2013
Updating of Frequency analysis
jonathon-love
pushed a commit
that referenced
this pull request
Oct 3, 2014
B ANOVA: Fix to assigning covariates and random
vandenman
referenced
this pull request
in vandenman/jasp-desktop
Mar 8, 2017
Save img functionality into base development branch
vandenman
referenced
this pull request
in vandenman/jasp-desktop
Mar 16, 2017
Added plotting functionality for variable importance. Added data reading functionality for factors (including a bug fix for factor reading). Added Tim's error handling. Note that ggplot2 2.2.1 is required, including all it's dependencies. Plotting functions will be moved to a common plotting file (or package) later.
boutinb
pushed a commit
that referenced
this pull request
Mar 23, 2017
…uild Added build instructions for Fedora
vandenman
referenced
this pull request
in vandenman/jasp-desktop
May 8, 2017
commit 4a7c0a87157b2b27d44ae2ac4d3e46a5b1d301c0
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon May 8 13:43:19 2017 +0200
improved code after review
Tim's `exitAnalysisIfErrors = TRUE` removes some code.
Alexander's Readability suggestions.
glb with reverse scaled items is still error prone.
.vdf should be read as numeric (everything should always be numeric in
the reliability).
commit 458a63354de0aeb254ef2a9641e29febe78b1d4a
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 18:25:29 2017 +0200
see previous
commit 6ee527e1754442eb9dd674f64bbe3d181bdce9ec
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 18:25:15 2017 +0200
Fixed typo + bug fix
Fixes https://github.com/jasp-stats/jasp-desktop/issues/1761 and now
throws an error message when less than 3 valid observations are provided
(instead of breaking down).
commit 5a35d1d16d955209b1fd58e5680b84e9f2be5cef
Merge: 55d4db45 3dfcef87
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 17:46:52 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 55d4db45f901430815cc68bdf84dfdee3573def5
Merge: b5463965 cd2c7d5e
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 16:26:46 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 3dfcef87d40700d6531adcc68d3f354737e55396
Merge: b80be165 3d1c4051
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 18:25:01 2017 +0200
Merge pull request #1760 from boutinb/development
Synchronization with paired variables analyses does not refresh
commit 3d1c4051aed80852f5102adac28e87036e6f88ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 18:23:49 2017 +0200
Synchronization with paired variables analyses does not refresh
commit b80be16578ba6c75f29d36936fe2afa803ede1dc
Merge: b50c7a06 530c3fcc
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 12:00:24 2017 +0200
Merge pull request #1759 from boutinb/development
Multi level table must have beter layout
commit 530c3fcc8f24db4ef2baefe238cb41016b72eb0c
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 11:58:41 2017 +0200
Multi level table must have beter layout
commit b50c7a06f580e605f827046b323b175bc9d935af
Merge: 15670b4d 823c3c4e
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 10:56:00 2017 +0200
Merge pull request #1758 from TimKDJ/development
Bugfix printing eps
commit 823c3c4e800fd1cf35ff2d36f539b70442d87008
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Thu May 4 10:52:54 2017 +0200
Bugfix printing eps
JASP crashes if you print the state with an image in it (I will try to
find out what’s wrong exactly)
commit 15670b4d6e920d11c73abccd06e248398d0757dd
Merge: cb0732a8 7596aaa2
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 14:25:47 2017 +0200
Merge pull request #1751 from TimKDJ/upgradeR
Reapply earlier commit and add R v3.3 functionality
commit 7596aaa29a358ee53592352667b8d78af6c38573
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed May 3 14:21:00 2017 +0200
Changed variable notation
commit cb0732a88d6ee876f0307de86fc9de82a56e8f5b
Merge: 8c3de5c2 9d312c75
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 11:33:22 2017 +0200
Merge pull request #1755 from quentingronau/subjectiveBayes
SubjectiveBayes
commit 9d312c7597ffb57be699e761e262a6e54e1ba929
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Wed May 3 11:31:53 2017 +0200
minor changes to informed Bayesian t-tests
commit 8c3de5c2e80abdf17d3935a1debda8b0b0f3ac08
Merge: 06317e66 b316f2e4
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 10:43:42 2017 +0200
Merge pull request #1754 from vankesteren/fix_names
Edited the labels of VS-MPR in UI
commit b316f2e45808511793a0fce26f313f26a699f975
Author: vankesteren <erikjan.vankesteren@gmail.com>
Date: Wed May 3 10:00:09 2017 +0200
Edited the labels of VS-MPR in UI
As per request of EJ
commit 06317e666681b4b0f4c30425c9af79d7b019fe34
Merge: cd2c7d5e 7b09c790
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed May 3 09:27:39 2017 +0200
Merge pull request #1745 from AlexanderLyNL/development
(1) correlationBayesian and correlationBayesianPairs: fixed up Tim's error handling (2) regressionLogLinearBayesian: small bug fix
commit 0a6d37afb418dddb31efc5e1906056456226f25f
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 15:37:09 2017 +0200
Change UI of SubjectivePrior And fixed % error bug
commit a2edd4b5d235e7623590a3934cdf8d220aaf4f36
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 14:05:32 2017 +0200
Remove spaces in log function
commit 973bd8d3f8849f01b0cf36d2fa793faf74ef2f79
Merge: 69832ac2 cd2c7d5e
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 13:57:13 2017 +0200
Merge remote-tracking branch 'upstream/development' into subjectiveBayes
commit 7b09c7904af45fd809c89180e10c910d063338a7
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue May 2 12:37:27 2017 +0200
Added comments and fixed up state order for variable names
commit 69832ac2d19e62dfb0408ec30be788634296e615
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 11:24:05 2017 +0200
added informed t-test functionality to common
commit ac190dc06c733bb1d7bc769c2fe2738e04bdaded
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sun Apr 30 10:22:01 2017 +0200
Bayesian loglinear regression fixed
Correlations:
- added argument for failure, so call bfObject$stat make sense
Log linear Bayesian:
- NA screening using anyNA this is faster
- default and minimum models now is 2
- call in Overstall’s package should be $table$prob$Freq
- TODO: Add memory
commit cd2c7d5e1313a7cd8c6121508f53b22c255d0acc
Merge: 0eb05225 862a5ef0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 26 08:53:52 2017 +0200
Merge pull request #1748 from JohnnyDoorn/development
Fixed some minor issues in t-test
commit 0eb0522518a66557ece8943f3d15fb55e847de4b
Merge: 99468f9f 21513bb2
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Apr 25 21:19:14 2017 +0200
Merge pull request #1750 from TimKDJ/bugfix/contingencyTables
Bugfix Contingency Tables
commit 21513bb253a5ecf4b9455d02a1a2f04ddb78f4ab
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Tue Apr 25 14:49:49 2017 +0200
Bugfix package upgrade, robustness .clean
commit 862a5ef0c099d701b107198de2536a65cb5a1986
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Tue Apr 25 14:18:52 2017 +0200
fixed the wording in the t-tests
now it has proper names, hypotheses are specified correctly
removed incorrect cohen's d for one-sample t-tests
commit 682fbf8317b2c43b1d0d3e62b82efe88be7e22f6
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 16:03:06 2017 +0200
Bug fixed object naming
At the wrapper level, i.e.,
- .bfPearsonCorrelation
- .bfKendallTau
I now include the result$stat entry to uniformly have the result. It
didn’t make sense for a .bfKendallTau object to have as argument
bfObject$r. When programming for Kendall’s tau, just retain tauObs in
the code, that is, in .bfCorrieKernelKendallTau etc etc
commit 96d84b39c4b6c31cf7740ba3785f4efaef644108
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 15:04:59 2017 +0200
Fixed up Tim's error handling
Removed tracking lists to store in state (memory)
- rValuesExcludePairwise
- footnotesExcludePairwise
- footnotesExcludeListwise
Footnotes and rvalues are now stored in the object, no need to track
more things
Name change:
new: memoryExcludePairwise
old: bfValuesListExcludePairwise
new: memoryExcludeListwise
old: bfValuesListExcludeListwise
Style:
Some style stuff in regressionloglinear.R
commit 99468f9f2d4423084c07efac6b51fdb5603f3793
Merge: 5e2ffda9 72beca7e
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 15:03:49 2017 +0200
Merge pull request #1744 from TimKDJ/bugfix/bas
Bugfix development version (BAS module)
commit 72beca7e696b9dbbd82c2f0acd64a74fbf3c7ed7
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Mon Apr 24 14:16:58 2017 +0200
Removed random d
commit 938cfa7d8b16e670814b2187d8ca5f49108d880f
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Fri Apr 21 22:14:19 2017 +0200
Revert earlier commit and add R v3.3 functions
commit 5e2ffda9a9ad25fc4d6f92ac77a68dcf31bb6378
Merge: 3df268b4 5902ac10
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Apr 21 13:36:41 2017 +0200
Merge pull request #1741 from akashrajkn/BAS-development
Added BAS Regression (development version)
commit 5902ac10d949e8d510f57b114180ec73d6ce65e3
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Apr 21 16:11:04 2017 +0530
Added BAS Regression (development version)
commit 3df268b43078e5986264c979aa3f699898bca39e
Merge: 9d350d4d 4d48aa82
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 20 11:47:08 2017 +0200
Merge pull request #1740 from akashrajkn/bugfix
Added ellipses to handle parameter variablility
commit 9d350d4d0c1945e61647cd63d44e10150933bd17
Merge: dbd0d21e 2dbfb6ac
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 20 11:46:39 2017 +0200
Merge pull request #1735 from AlexanderLyNL/development
(1) credible intervals Bayesian correlation matrix and Bayesian corre…
commit 3cc33cef3a3e79b5db631ebfa38defdc6f13c8ce
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 13:00:10 2017 +0530
UI improvements to subjective priors widget
commit eacb873e4c21cc0e07d0ec28847949c59bef723d
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:59:48 2017 +0530
Added subjective priors to Bayesian TTests
1. subjectivePriors widget added to independent and paired samples ttest
2. added priors to the json file
commit 484c4c2d800467f3bf2d67e7580938fdcabc446e
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:33:04 2017 +0530
Replaced prior layout with SubjectivePriors widget in one sample ttest
commit d16dfa6242ff14f18e439a29233a385063022ca3
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:29:01 2017 +0530
Created subjective priors widget
commit 18d753c794db85baff987beb4f91a2e8b4ff2a18
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Feb 10 17:02:21 2017 +0100
Added prior options to ttest one sample
Created layout for Subjective Bayes
commit 2dbfb6ace84d274d27e8bbc333a13500396e70da
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 10:27:37 2017 +0200
Style changes and removed .Rhistory file from pull request
- Removed .Rhistory
- Style:
new: ) {
old: ){
new: if (..
old: if(..
new: else {
old: else{
commit fe05c882d0ab0da1fff78c40946abbbd227be22a
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 08:53:24 2017 +0200
Style: removed spaces LogBF10
commit f8c1fe670fb65dafbcfa929a5328cdacc2fbe7cc
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 08:33:38 2017 +0200
Style: Grammar changes
1. Removed spaces of logBF10,
2. Style change table headers in the t-tests:
- new: Statistic, old: statistic
- new: Confidence interval, old: Confidence Interval
commit 4d48aa822296e08e42e6ec3ea311b4b95d22b91f
Author: akashrajkn <akashrajkn@gmail.com>
Date: Wed Apr 19 21:43:55 2017 +0530
Added ellipses to handle parameter variablility
commit dbd0d21e864244b569b94ab45767fc3b6ad7d82e
Merge: 94eb0ab8 a44fa29c
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 19 16:39:50 2017 +0200
Merge pull request #1739 from JohnnyDoorn/kaas
Fixed Cohen's d
commit a44fa29cde3338eb89fcb716157af07774ca5005
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Apr 19 16:26:55 2017 +0200
Fixed Cohen's d
commit b5463965898d6511fca877d7404b14dd2b87e3c4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Apr 19 15:05:26 2017 +0200
Changed Advanced Options to autohide
modified advanced options box to have a container and modified cpp file
to hide said container.
commit 7c5b8ed29153cd0fb0e0eeacbec382ff55639553
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Apr 19 13:29:11 2017 +0200
some style changes
commit 94eb0ab887169798cd77e019ea5a389e749f933a
Merge: b6149a14 9db8691c
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 19 11:53:29 2017 +0200
Merge pull request #1736 from boutinb/development
Make About box selectable
commit 9db8691c86090269c2768410fa28609e96e51380
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 19 11:33:57 2017 +0200
Make About box selectable
commit 2ab7e7ce80f4995b1fd7db4ecdc602bb839d4802
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Apr 19 11:04:39 2017 +0200
(1) credible intervals Bayesian correlation matrix and Bayesian correlation pairs, (2) p-values for sumstat Kendall's tau
R changes:
- give sensible p-values and BF for Kendall’s tau when n <=2
- Only partially cleaned up correlation.R
- added isTRUE in code for robustness reason
- Removed additional layer in the bfObject when it comes to ci. Check
for ci goes via bfObject$ciValue, say, 0.95, and the intervals are in
bfObject$ci$twoSided, bfObject$ci$plusSided, bfObject$ci$minSided.
- Example: bfObject$ciValue <- 0.95 and bfObject$ci$twoSided <- c(-0.3,
-0.2, 0.1). Tells me that the 95% CI is from -0.3 to 0.1. The point
-0.2 is the median.
Style:
- reordered the input in kendall tau functions, first data, then
parameters then hyperparameters: Data: n, tauObs. Parameters: tauPop,
Hyperparameters: kappa, var=1
- .bfKendallTau is a wrapper around .bfCorrieKernelKendallTau.
Basically, it switches between various methods and various variances
- Removed double function definitions in .correlationbayesianpairs.R
- renamed functions: (1) .credibleInterval to
.computePearsonCredibleInterval
UI son and ui, cpp:
- Bayesian Correlation matrix and pairs now have button for credible
intervals <- slot is called “credibleInterval” which is true or false,
percentage is now referred to as “ciValue”
commit b6149a14bc09db08a2680e37f50221b8aab38a99
Merge: c925a5ce badb8ee4
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Apr 18 09:51:36 2017 +0200
Merge pull request #1656 from SachaEpskamp/development
SEM udpates
commit 5c1f3051813af317c84adfea34f238c0c0363168
Merge: b41a15b8 c925a5ce
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 14:00:54 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit b41a15b839368a304a65eff3b75364ab30bed80c
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 14:00:38 2017 +0200
Fixed try-errors and added warnings in footnotes
made use of common function isTryError instead of inherits. isTryError
does not use "inherits" which could be a problem for objects with
multiple classes.
commit 07fffe34ac7194a289c3ae067438c93b91ae2db9
Merge: 1c5b7b02 3883a241
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 12:36:08 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit c925a5cebd06a309b95ac3d6652a9ea575c08bce
Merge: c65e4b6f 07b2ee9f
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:21:56 2017 +0200
Merge pull request #1732 from FransMeerhoff/development
Prepare 0.8.1.2
commit c65e4b6f3dbca866f873371e4a1932aea14c9e10
Merge: 205ae4ae 7ec8ce98
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:21:04 2017 +0200
Merge pull request #1733 from boutinb/development
Make even rows more grey and keep them grey when they the table is not selected
commit 7ec8ce9818967ea877e810dfe95b4133e4af844c
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:13:41 2017 +0200
Make even rows more grey and keep them grey when they the table is not selected
commit 07b2ee9fa1ecd612ec200adb69ff3902ec3de1b6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Apr 13 15:57:37 2017 +0200
Prepare 0.8.1.2
Update version numbers
commit 205ae4ae9677851cdee941f59b971571b7169db0
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Thu Apr 13 13:58:14 2017 +0200
New pull request to add tims error handling to correlation (#1731)
* Added Tim Error Handling
Fixed issue #1677 with ANOVA table
* Added Tim Error Handling
Fixed issue #1677 with ANOVA table
* Merge branch 'development' of https://github.com/JohnnyDoorn/jasp-desktop into development
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
commit e62c15dd955f99e6b192c589c7bdae194c659610
Merge: fd051890 a91ef1a7
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 17:34:04 2017 +0200
Merge pull request #1726 from FransMeerhoff/development
ggplot2 problem
commit fd0518900d311eed56cf4c25464e0d29dce7ece1
Merge: 9025224d 17165d72
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 17:33:20 2017 +0200
Merge pull request #1730 from TimKDJ/development
Improved state retrieval
commit 17165d72f563db250ef8e0f1b981d95b4032ad82
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed Apr 12 17:29:29 2017 +0200
Improved state retrieval
commit badb8ee4a7df986a724a3aadd0063d244f439e51
Merge: 60a7e194 9025224d
Author: Sacha Epskamp <sacha.epskamp@gmail.com>
Date: Wed Apr 12 17:00:22 2017 +0200
Merge branch 'development' into development
commit a91ef1a771bf9f6f9a314cc5ff4ea9eaff5df9f1
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 12 14:28:36 2017 +0200
ggplot2 problem
Principal Component Analysis and Exploratory Factor Analysis called
ggpltot2::theme with multiple argument
commit 9025224d759e369c090f10e39a09965b13699876
Author: Erik-Jan van Kesteren <erikjan.vankesteren@gmail.com>
Date: Wed Apr 12 16:28:31 2017 +0200
Save Image As - functionality (#1727)
* Add Save Image As EPS/PNG feature
* Add Save Image As EPS/PNG feature
* SaveImage clean code step 1
* test
* Edit hack solution
* remove warning
* SaveImage edits: remove width & height in cpp
* New redrawplot function
* Read height & width + overwrite possible
Also includes a dpi conversion fix
* Clean saveImage code & implement in descriptives
* Add saveimage menu option only if convertible
* tab align small fix
* Re-perform fix boxplot error bar width
* Stricter convertible functionality js
* Add documentation to /docs/development
* Rename documentation
* update md, add convertible img to ttest
* Add parsing convenience functions & adjust
.imgToResults and .imgToState
* Update saveimg documentation
* test change don
* test change back
* start on Anova
* deleted commented code
* more commented code deleted deleted
* t-test plot convert for saveimage
* Anova is now fully functional. Note that `convertible = TRUE`
* start on Anova
* deleted commented code
* more commented code deleted deleted
* Anova is now fully functional. Note that `convertible = TRUE`
* Updated all analyses with quick fix for eps figures
in EFA and PCA: Path diagram gives an error because library magrittr is
missing. Summary stats functions error because .extractErrorMessage is
missing.
* additional changes and backwards compatability with previously done analyses
* binom test first implementation eps
* Add tiff
* Cleanup EPS implementation
State logic moved to common
* Cleanup EPS implementation
* Overwrite png possible, cleanup descriptives
* Reintroduce lost "extracterrormessage" function
* fix bug plotfunc in summarystats
* dpi fix
using png device and dev.size()
* Fix dpi scaling issue
* Fix ggplot2 backwards compatibility
commit d6d7c2791093ea185ddd76dff3374ef280b84931
Merge: 65c9c14a 68b19b4e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 16:26:18 2017 +0200
Merge pull request #1728 from boutinb/development
Better SPSS synchronisation
commit 68b19b4eb49599beca9ac1338932d0931e7edc37
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 16:06:45 2017 +0200
Better SPSS synchronisation
commit 65c9c14a208ba9a999789ca081a81f00a2e17a77
Merge: c12f9055 a49df5cc
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 13:54:09 2017 +0200
Merge pull request #1723 from FransMeerhoff/r_upgrade
Enable R 3.3
commit a49df5cc366687402cea40e0dd7c3102dea2640d
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Apr 11 19:10:45 2017 +0200
Update jasp-building-guide.md
Fixed up broken links due to spaces
commit c12f9055d80511395aaf9c0f1da72efaa4ddfa26
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Apr 11 19:10:45 2017 +0200
Update jasp-building-guide.md
Fixed up broken links due to spaces
commit d989b6e3dc81fa58a65513351d10165bd9ca769f
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Apr 6 14:32:38 2017 +0200
Enable R 3.3
commit 3883a2416c8f0621c9c52d58730c1b245b70ba36
Merge: a9209d8a 009c4b65
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 11:18:50 2017 +0200
Merge pull request #1717 from boutinb/development
Add tooltip to the Anova Model Widget to help make interactions
commit 009c4b65a1c123c46669d0df2955a9b2658c6678
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 11:04:48 2017 +0200
Add tooltip to the Anova Model Widget to help make interactions
commit a9209d8af0fa63c1113906b4e41b5c0e68798792
Merge: 5ec73983 b10a74a8
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:36:09 2017 +0200
Merge pull request #1707 from TimKDJ/bugfix/NALevel
t-test fix
commit 5ec739835848955985e0fcd5cd92a5e6306710f4
Merge: 8af04853 66dc1d5a
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:34:56 2017 +0200
Merge pull request #1709 from jasp-stats/TimKDJ-patch-2
Added state explanation
commit 8af04853aad4b2f1a99f6d74b65b8feed92a9b99
Merge: 8fe3c188 dd739671
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:34:35 2017 +0200
Merge pull request #1712 from TimKDJ/feature/BestModelTop
Compare BayesFactor output with best model
commit 8fe3c1887260f2c36af8c955db7833ef573b6007
Merge: dd87f95a 4adfaba2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:16:33 2017 +0200
Merge pull request #1716 from FransMeerhoff/r_upgrade
Add RInside code to JASP-Engine
commit 4adfaba27704b003d9962463b6a1fd448b668702
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 2 17:22:00 2017 +0100
Add RInside code to JASP-Engine
The cpp code from the RInside package is added to the JASP-Engine.pro
commit 66dc1d5a11891f7c04f4509aabbeb64b531b0c7c
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Thu Mar 30 15:38:07 2017 +0200
Added state explanation
commit b10a74a896abf0e49f56f042d5a4ac048d2171a7
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 30 13:00:47 2017 +0200
Fix to NA levels and minimum obs amount
commit dd739671e40794215b99a337e740322fc72a9b96
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 30 10:52:51 2017 +0200
Best model top
commit dd87f95a039313b4284fda8e7481e3a4ef2f5a02
Merge: 0259ccef aba7aad6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 10:28:54 2017 +0200
Merge pull request #1706 from FransMeerhoff/development
Typo issue template
commit aba7aad67fa9dc0564ed5188d7d6d6e3119a76e7
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 09:47:21 2017 +0200
Typo issue template
Typo issue template
commit 0259ccef391eca417a8e6165678dc135e93fe1e4
Merge: 0e2645fd 2973e181
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 30 09:44:10 2017 +0200
Merge pull request #1705 from FransMeerhoff/development
update issue template
commit 2973e18127f6082dde9a0c4cb9b414832428373a
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 09:37:29 2017 +0200
update issue template
Make a distinction between enhancement request and bugs
commit 1c5b7b02414f7275dfe06629f679418d0355d59f
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Mar 29 00:08:15 2017 +0200
Added missing value handling and Greatest lower bound
In addition: some minor code cleaning (changing `=` into `<-` ); added a
footnote warning a user that three or more variables are required for
the glb; using a try construction for the glb since it is error prone.
TODO: check why psych::alpha(d, key) can run while psych::glb(d, key)
errors for the same input.
commit 74b147ce9f7d747f0254d4d74d8fdbaaa88b8c6d
Merge: edd69b08 acb373f2
Author: vandenman <donvdbergh@hotmail.com>
Date: Tue Mar 28 19:48:53 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 0e2645fda85af6299911cefcdd66d5a21fcaf5b5
Merge: acb373f2 c6aaef1e
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 28 10:38:29 2017 +0200
Merge pull request #1701 from boutinb/development
About box on Mac does not work
commit c6aaef1e4dca136d0ac551fd24bcb9ca02950d23
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 28 10:32:08 2017 +0200
About box on Mac does not work
Solves #1700
commit acb373f23dccbf87c66f49beb6cdc13dbcdd426c
Merge: 794b38f8 4ee4569b
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:49:20 2017 +0100
Merge pull request #1686 from silberzwiebel/development
Added build instructions for Fedora
commit 794b38f84957a5078a69d8f4ad023b884af835fc
Merge: 04df2733 638d60c5
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:48:51 2017 +0100
Merge pull request #1688 from akashrajkn/fix/summary-stats
Fixed the BF10 bug in posterior plot
commit 04df2733894186b825a1dd6b7f518482088eaaa4
Merge: b6e11ded 88cf26ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:46:17 2017 +0100
Merge pull request #1696 from boutinb/development
Crash when open a JASP file after closing another one
commit 88cf26ed0ee086a625c2b84896f1e73a23be709a
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:44:50 2017 +0100
Change variables can crash when an analysis was deleted
commit 41b8512d1293f78dcceea4c9650b1ecd85ef4aad
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 22 10:57:11 2017 +0100
Crash when open a JASP file after closing another one
When closing, the analyses must be internally deleted.
commit b6e11deddb7a5b4fc5045fa3a0f840a44f5f1e0f
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 21 14:24:53 2017 +0100
Remove TestFiles.zip from installer in mac
commit b8bfd96dcd18cd39ef9fafa9113c12fd6d69df1f
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 21 12:12:16 2017 +0100
Set right citation for analyses
commit 638d60c51e7dcef8487ceb97289a0403f344eda1
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sun Mar 12 10:30:55 2017 +0530
Fixed the BF10 bug in posterior plot
commit 4ee4569bc25839b06d733ff41035e7e2ef8a6cb5
Merge: 00905323 9981ad9c
Author: silberzwiebel <silberzwiebel@users.noreply.github.com>
Date: Fri Mar 17 09:26:17 2017 +0100
Merge pull request #1 from silberzwiebel/silberzwiebel-patch-fedora-build
Added build instructions for Fedora
commit 9981ad9c8576478b8487dd8ae3baee1b5f04dcb2
Author: silberzwiebel <silberzwiebel@users.noreply.github.com>
Date: Fri Mar 17 09:25:24 2017 +0100
Added build instructions for Fedora
After I had some troubles some months ago (see https://github.com/jasp-stats/jasp-desktop/issues/1507 ) I wanted to look at the new release and managed to compile it under Fedora using these instructions. I thought, they might be better in a central place then only at my PC.
commit 00905323a97e1e4200d9740244e69bcef2285e93
Merge: b09e227a eb3e376d
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 17:31:07 2017 +0100
Merge pull request #1685 from TimKDJ/bugfix/levelCheck
Omit NA's from the factor level check
commit eb3e376d827aaeb1b2b573071dc00770010d4876
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 16 17:24:50 2017 +0100
Omit NA's from the factor level check
commit b09e227a5e3375770ca39d2ae5b64195c9fffd24
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 16:53:35 2017 +0100
Set Version for 0.8.1.1
commit 1951c8d4df2645a9e2f09063c6f5f47cc971b37e
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 16:49:44 2017 +0100
Fixes #1672: JASP crashes loading CSV
commit a3dc1fa83e22d947103dcb75ced20567b6bea0d0
Merge: 892647e5 343d3c34
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 16 15:56:57 2017 +0100
Merge pull request #1679 from AlexanderLyNL/patch-2
Update r-style-guide.md
commit 892647e5f3abdee5a50655a50a6caf096298b5c7
Merge: 7c2f7b9e 0288beda
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 16 13:34:28 2017 +0100
Merge pull request #1680 from AlexanderLyNL/development
Small init bug fixed
commit 7c2f7b9e6785de58a358c38ccb58d68cd8421ddc
Merge: 8ad4fb87 e3313818
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 10:04:37 2017 +0100
Merge pull request #1681 from akashrajkn/issue-template
Added ISSUE_TEMPLATE
commit e3313818c736d8da228a879316b53232a064ba54
Author: akashrajkn <akashrajkn@gmail.com>
Date: Thu Mar 16 11:12:28 2017 +0530
Added ISSUE_TEMPLATE
commit 0288beda9618c994d67db67798159d51aaa617a9
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 22:24:55 2017 +0100
Added comments to code
commit a3429f4ff7862b5a07e1bceb549ebe2842be487a
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 19:01:15 2017 +0100
Small init bug fixed
commit 343d3c34774a7c5e7103276fc0e1579cf11b0769
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 17:25:21 2017 +0100
Update r-style-guide.md
commit 8ad4fb87e731049d2dcddbd53648055c32ec39bd
Merge: 90d7b273 7d26deec
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:52:33 2017 +0100
Merge pull request #1659 from TimKDJ/bugfix/slowBayesianAnalyses
Solution for the slow Bayesian init
commit 90d7b273c371895acc9eb9b3463abcd9a8c557ca
Merge: 4a45854d 649f2ad9
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:50:11 2017 +0100
Merge pull request #1673 from AlexanderLyNL/development
Added dormant replication BF for the correlation, cleaned out code
commit 4a45854ddc848e41207ba5b4cc76bdde95b76cb3
Merge: 47387245 09319845
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:48:51 2017 +0100
Merge pull request #1676 from FransMeerhoff/development
Generate log file on Windows
commit 649f2ad982d6ca424b33d776c1f9330591a290ac
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Mar 14 22:07:02 2017 +0100
added some small remarks in the style guide
commit 093198451b0c1cd36279ade918ca93ce2aeed7a1
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Mar 14 16:35:07 2017 +0100
Generate log file on Windows
Enable giving output on windows by starting JASP from the command line
by typing <installdir>\JASP.exe > c:\temp\JASP.log
commit 47387245b6df3ac5cb536272581d6e5d4781e0e1
Merge: 3b83ecac 8f0bd409
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 14 15:06:28 2017 +0100
Merge pull request #1675 from boutinb/development
Add resize column in data view
commit 8f0bd409ecd85c59dc74dff44faf31588c4a9dd0
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 14 14:52:02 2017 +0100
Add resize column in data view
commit c3c62c5a1811c2467d67dc3406c6ae324f084618
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Mar 13 16:33:41 2017 +0100
Style guide updated
Style guide updated
commit 74603bd375708ae89f71f2cc367167d6b5cf6203
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Mar 13 11:19:34 2017 +0100
Added call statement
- bfObject$call tells you the R code
- obsR, obsN changed to rObs and nObs
commit edd69b082b81bbed409e7bb0ec6f42f23d743f66
Merge: 31087d15 3b83ecac
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun Mar 12 10:27:12 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 0dfc145344daaada556da45a6f9d2177f061f6e6
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sat Mar 11 16:53:21 2017 +0100
Fixed the combined one-sided bfs
commit f57e13d7a0d62161f3eeddc6af92b06952f39b63
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sat Mar 11 14:20:27 2017 +0100
Added dormant replication BF for the correlation, cleaned out code
Added:
- isTryError in common
- .bfPearsonCorrelation, a wrapper around .bfCorrieKernel that loops
over the methods automatically
- Rewrote .bfCorrieKernel. The method numbers in .bfCorrieKernel now
refer to 1. exact likelihood, 2. jeffreysApprox likelihood, 3.
Savage-Dickey beta approximation to the likelihood, 4. Marsman sampler,
5. Jeffreys asymptotic approximation, 6. Error. Thus, numerical is
swapped for Savage-Dickey beta approximation
- .bfHypergeo is a wrapper for method 1 and 2. Automatically switches
from hypergeometric result to numerical integration whenever the
two-sided bf10 > 10^(hyperGeoOverFlowThreshold)
- Added .bfCorrieRepJosine, which is not activated in the UI.
.bfCorrieRepJosine takes on the role of .bfCorrieKernel for replication
(summary stats) data.
Changed (mostly style changes):
- camelCases: Changed variable.names to variableNames to adhere to the
style guide
- all.bfs to bfObject
- some.r to obsR
- .jeffreysApproxH function to . hJeffreysApprox
- changed return(NaN) to return(NA) in .bf10Exact - though I had some
semantical reasons to use NAN instead NA, but this can be solved by
identifying NULL to not calculated yet
- changed function call by name rather than position
- added name spaces to some functions calls, such
- removed base name space for is.infinite
Removed:
- Removed .bf10Numerical, it isn’t used anyways, but hard coded in
commit 3b83ecaccdf24db95e1028b5b0926c67833d8c9e
Merge: 29c332d1 484c811d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 8 13:24:36 2017 +0100
Merge pull request #1663 from TimKDJ/patch-1
Added/clarified error handling documentation
commit 29c332d1b158c35451d9bbe26f8bf8974fdf2517
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed Mar 8 13:24:16 2017 +0100
Enhancement error handling (#1664)
* Documentation for creating module added
* Fixed flashing of options window after stacktrace click
* Update make-dmg script
* Set min size for preferences dialog
* Bug fixes Reliability analysis (#1650)
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
* Ignore extracted testfiles
* Make the preferences dialog bigger
* Synchronzation with OSF Files
* Refine tooltip messages
The tooltip on the column is split into a separate tooltip for the icon
and column name
* Remove ? mark on Preferences dialog
Remove ? mark on Preferences dialog.
Appears only on Windows
* File from examples should not be editable.
* Added tests SEM module
From Sacha :
Added
HolzingerSwineford1939_covmat.jasp and MeasurementInvariance.jasp
* Fixed RM ANOVA so that factor names can be changed with correct consequences for the tests
* Change tooltip on scale column header.
* Remove optionforms relicts (#1662)
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Added support for custom checks, various improvements
commit 77c22ea47ee6c3e75871a43e6153b9a88a415985
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 8 12:14:30 2017 +0100
Small bug on sync
commit ac75916896287dd35245261cb6fed7d7c9c7de21
Merge: db7ae625 efef726c
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 7 11:36:01 2017 +0100
Merge pull request #1665 from FransMeerhoff/development
Update Mac build script
commit db7ae62501e6724b97d13b668b31c9e8f14fd0fd
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 7 11:32:27 2017 +0100
Variable Window updates
Add tooltip.
Remove vertical header.
Add background color for values
Don’t refresh analyses when label did not change
commit efef726c24d7a39cb858281ca05f34990a947da6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Mar 7 11:07:49 2017 +0100
Use parameter for Info.plist.template
Use the JASP_DESKTOP parameter to copy to proper location.
commit 484c811d8bfe5972ebb38d17def6974bc8ec2d0a
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Mon Mar 6 14:59:13 2017 +0100
Added custom explanation and some clarifications
commit bd7951c1710617ce62b037705720fd103a2d28fa
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 16:51:19 2017 +0100
Remove optionforms relicts (#1662)
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
commit 0aeb84801ee1ad0850c436f3ad1528484edc5c68
Merge: 34856706 012db9a6
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 16:44:10 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 34856706a9516bee62ebb7b2bd065b1483b9179e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 16:43:27 2017 +0100
Change tooltip on scale column header.
commit 012db9a6a4d648384251e0ba0f4665503a656219
Merge: 757a3f19 a651e44f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 15:56:58 2017 +0100
Merge pull request #1660 from JohnnyDoorn/development
Fixed RM ANOVA names for post hoc tests
commit a651e44f7589e3ac9dc042f532d5490f9fd9e63a
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Mar 1 15:51:21 2017 +0100
Fixed RM ANOVA so that factor names can be changed with correct consequences for the tests
commit 757a3f19652f53df4b1144ae7890a78e7ff1c2d6
Merge: 9f898d4a ada6f205
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 15:37:05 2017 +0100
Merge pull request #1658 from FransMeerhoff/development
Added tests SEM module
commit 7d26deec2e87300c631d61f4898f2e67e0911a8b
Author: TimKDJ <tim_jong@hotmail.com>
Date: Wed Mar 1 11:15:50 2017 +0100
Solution for the slow Bayesian init
commit ada6f205f56e6843521768611b746d429ee90942
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 09:21:59 2017 +0100
Added tests SEM module
From Sacha :
Added
HolzingerSwineford1939_covmat.jasp and MeasurementInvariance.jasp
commit 9f898d4a12de353edae37c33ef5a31d25e5ea736
Merge: ccff6603 517b1d34
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 14:28:17 2017 +0100
Merge pull request #1657 from FransMeerhoff/development
Remove ? mark on Preferences dialog
commit ccff66030fdbf810561f792b230706123883d26b
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 14:11:16 2017 +0100
File from examples should not be editable.
commit 517b1d347c97c1edede64026663ee52174e96712
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 23 16:07:33 2017 +0100
Remove ? mark on Preferences dialog
Remove ? mark on Preferences dialog.
Appears only on Windows
commit d90376dbc9fb47833fbc572fec375fbf07e664cc
Merge: 83c29dd4 6f7b5b4b
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 10:56:30 2017 +0100
Merge pull request #1654 from FransMeerhoff/development
Refine tooltip messages
commit 60a7e1942f0dd2c30258c7acb1f84d8a012dc184
Author: Sacha Epskamp <mail@sachaepskamp.com>
Date: Fri Feb 24 18:11:37 2017 +0100
SEM udpates
SEM updates: Multiple models, covariance matrix as input, measurement
invariance tests.
commit 6f7b5b4b0b27d2cb55218335f1c73cc526df9e09
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 23 11:25:17 2017 +0100
Refine tooltip messages
The tooltip on the column is split into a separate tooltip for the icon
and column name
commit 83c29dd4371c322a2959773fa4ea8ff50035dfe5
Merge: 104dd0d5 8b167140
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 15:58:29 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 104dd0d51e96aa68b2fba2eb5e8c8c333eccae5b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 15:57:52 2017 +0100
Synchronzation with OSF Files
commit 8b167140e83835fb309630e523217605c4e745ff
Merge: d6edb06b 15a3415d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:44:28 2017 +0100
Merge pull request #1651 from FransMeerhoff/development
Ignore extracted testfiles
commit d6edb06b0cbef32d611be361e1763328b2a67a90
Merge: 4233cf0c e6540fab
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:40:59 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 4233cf0ce452962de319595abe29ed9d859186d0
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:40:28 2017 +0100
Make the preferences dialog bigger
commit 15a3415d67739f6fe92f003f006674047aca2498
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 22 12:28:28 2017 +0100
Ignore extracted testfiles
commit 31087d15c0456868aea21c8d74782be2ae7cc907
Merge: 81b9b768 9feba33e
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 12:10:52 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit e6540fab0eebcb4d05dfbb6537b6268b88411d97
Merge: dc1fe7dd e08d9202
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 12:09:56 2017 +0100
Merge pull request #1645 from TimKDJ/bugfix/stacktraceWindowFlashing
Prevent window change after stacktrace click
commit dc1fe7dd66b03b93dca4fa26823d83a033c61777
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 12:08:55 2017 +0100
Bug fixes Reliability analysis (#1650)
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
commit 81b9b768cdcb30148100879e71a9829b6c2acf1a
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 10:31:01 2017 +0100
Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
commit 9feba33e85bed835af330273b6a8760185f94f75
Merge: b5f4df81 60ff447d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 09:53:41 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit b5f4df819dd81720f35bc4cc68e6e82119389d16
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 09:51:58 2017 +0100
Set min size for preferences dialog
commit 60ff447d0d45186862622ac90006f69311ed80d2
Merge: 3aebe5a1 11a20eed
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 21 09:58:55 2017 +0100
Merge pull request #1646 from akashrajkn/docs/add-module
Documentation for creating a jasp-module
commit ec42171203939872633f12f1fe5a53a748087b61
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 16:00:11 2017 +0100
a more appropriate bug fix using Tim's suggestion
commit 3ac745459c5d648b1be5904040a97f68cffdf72b
Merge: bd69b33d 3aebe5a1
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 15:43:46 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 3aebe5a10f2f6fdd750d28d722282f729e2a0bd6
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Feb 17 11:55:57 2017 +0100
Update make-dmg script
commit 11a20eed45a2b7bb42be9df19f1e200cb53e3b50
Author: akashrajkn <akashrajkn@gmail.com>
Date: Wed Feb 8 14:40:45 2017 +0100
Documentation for creating module added
commit bd69b33de89f0804fe43718a023aa7310c13a7c0
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 10:15:54 2017 +0100
clearer comment
commit 7a36c8122170f49c373dc207637fe05f23ca141d
Merge: 9cbf62a3 335c549a
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 01:06:17 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 9cbf62a385b141af00550a7799c45076b715b051
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 01:05:23 2017 +0100
bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
commit 96055e897145fa6ac70facf4f822b672c528dcad
Merge: bae9bc85 49144519
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 21:42:38 2017 +0100
Merge branch 'ReliabilityUpdates' of https://github.com/vandenman/jasp-desktop into ReliabilityUpdates
commit bae9bc85640f6db7bdab169f4acbcf607a51609e
Merge: 6cbb3c94 68f46fa3
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 21:22:01 2017 +0100
Merge remote-tracking branch 'refs/remotes/origin/development' into ReliabilityUpdates
commit e08d920292543dd8efe51685cafb239dafb6a4e8
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 17:26:01 2017 +0100
Fixed flashing of options window after stacktrace click
commit 335c549a710e78c8546715c4f153cbb55482dcca
Merge: 4d1b031c bdd841ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 16:20:55 2017 +0100
Merge pull request #1644 from TimKDJ/bugfix/errorBoxSize
Resizing of analysis box when an error is added
commit bdd841edb68ac3086ccf7e75f60f0cf220549ff6
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 16:13:46 2017 +0100
Resizing of analysis box when an error is added
commit 4d1b031c6a2e2455727ba1f0997095b419dc8b75
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 16:12:50 2017 +0100
variable window layout
commit 49144519fc146edf0f9f03389629723b273ebee0
Merge: 30b542ec 00265fcf
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 14:58:47 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 00265fcf6834e68c576c2ba7fd5d408569657527
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:49:21 2017 +0100
Crash after double-clicking when no data is loaded
commit 77d7c8b9b8d1a67288a867cac5a70c89d23869e2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:28:23 2017 +0100
Wrong label when missing value in ODS
commit 0b1910b56b963534ee2f49fa450d4dd4b7322819
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:15:35 2017 +0100
Add warning when default spreadsheet editor not found
commit 30b542ec25b805a91a2b8aa34da62299bf7470bd
Merge: 4be95fee c675a4a7
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 11:34:38 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 4be95fee9e494199751f2a20a0de69a943477052
Merge: a81e8ba0 f1fd60c2
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 11:16:25 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit c675a4a7dc63a40b9a85852d7323e05c705bc146
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 11:15:12 2017 +0100
Remove orig file from pro file
commit f1fd60c2c5176894c52021b644d4e13e170d12d0
Merge: 59653cc5 7db2b5c5
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:42:53 2017 +0100
Merge pull request #1603 from TimKDJ/Enhancement/descriptivesBayesianAnova
Descriptives Bayesian ANOVA
commit 59653cc5830578b71a2e81c01d62ec0136687bc8
Merge: 1ad201e7 75c5c4fb
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:26:05 2017 +0100
Merge pull request #1642 from TimKDJ/development
Typo, comment cleanup and stack trace bug
commit 75c5c4fb2c6743f33071fb26c3696348e54c4f05
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 10:14:49 2017 +0100
Typo, cleanup and small stack trace bug
commit 1ad201e74417e87392ba2cedd7e8a5d5c250bcf3
Merge: 0d3dde7b 7a0feace
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:03:14 2017 +0100
Merge pull request #1641 from boutinb/development
Beter handling with spss file
commit 7a0feace049b2142e1fee2695160624a20366d66
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:01:42 2017 +0100
Beter handling with spss file
commit 0d3dde7ba7d1e71e3f0a7d05f57af696310c8f19
Merge: 307f90e4 f767fa1d
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 20:50:26 2017 +0100
Merge pull request #1639 from FransMeerhoff/development
Update psych R package from 1.4.8.11 to 1.6.12
commit a81e8ba0cfebba6b2bc19b0442bb10fb717beb66
Merge: 6cbb3c94 307f90e4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 19:45:59 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit f767fa1d7d270db7efe97907be8c0c531f59f5a0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 18:14:31 2017 +0100
Update psych R package from 1.4.8.11 to 1.6.12
Update psych R package from 1.4.8.11 to 1.6.12
commit 307f90e4984271a11ec25a1d23e6051d48f653fd
Merge: 0f2893aa 82c1d13e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:54:47 2017 +0100
Merge pull request #1638 from boutinb/development
Add tooltip in table view
commit 82c1d13edb6e86226191289a181c431fc203bab3
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:54:14 2017 +0100
Add tooltip in table view
commit 68f46fa3833c2464fe89b77b83dfc26d67c352a6
Merge: b54b7d22 471bfbf4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 17:25:49 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into development
commit 0f2893aa8e27e50d6e2785376c4a988d0af08a2a
Merge: 2a5bac77 ba40399b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:21:23 2017 +0100
Merge pull request #1637 from boutinb/development
Error when filename contain #
commit ba40399b6e7b2e28975895f3463844db00522fdd
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:20:45 2017 +0100
Error when filename contain #
commit 2a5bac7745fe0a45c7ab011c91d05aa480eda75b
Merge: 471bfbf4 98d40573
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 16:51:33 2017 +0100
Merge pull request #1636 from boutinb/development
Set file name when exporting data
commit 98d40573a6b99ed538a3857f5013e7143e7b0116
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 16:50:46 2017 +0100
Set file name when exporting data
commit 471bfbf46d65713ca9c7efdbcdd802eb25790993
Merge: af12357d 277b345a
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 15:34:22 2017 +0100
Merge pull request #1635 from boutinb/development
Compile Error on odssheetcell
commit 277b345aec0c166002e0836197415301360f608b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 15:33:57 2017 +0100
Compile Error on odssheetcell
commit af12357da3ef46df4003d06e89d2a4cea784c783
Merge: 92e9dd00 26c0a289
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 14:39:20 2017 +0100
Merge pull request #1634 from boutinb/aknight1-uva-development
Aknight1 uva development
commit 6cbb3c94c24adef121756b932a980632f86338ea
Merge: 2cbfc171 92e9dd00
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 14:33:30 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 26c0a28968515afc84e57b9b2e40cd61eac27cbf
Merge: 92e9dd00 c310311b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 14:32:18 2017 +0100
ods support
commit 92e9dd00d21470b3ad0a3240192f4048b793df9b
Merge: 0e8535d7 02038a34
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:56:03 2017 +0100
Merge pull request #1633 from vankesteren/development
Add easter egg to javascript console
commit 02038a342a136b716a9e26ed8e0ba4b2d42ec46d
Author: vankesteren <erikjan.vankesteren@gmail.com>
Date: Wed Feb 15 13:53:45 2017 +0100
Add easter egg to javascript console
link to the github page
commit 0e8535d732eac9f8d4c687135495e45fc6371f3c
Merge: a15952e1 090c001f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:14:50 2017 +0100
Merge pull request #1632 from boutinb/development
preferred typo
commit 090c001f0b14afe090e7bcebdcf6c25a3283a9d8
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:13:56 2017 +0100
preferred typo
commit a15952e1e2a2922ccd899a4d162f503fbdf2a0a1
Merge: 2eda2184 b66ac3b5
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:06:11 2017 +0100
Merge pull request #1631 from FransMeerhoff/development
Change default application folder different platforms
commit 2eda2184a2060cbcc9898e3eeb434ec1d2077154
Merge: 9639f7c4 82db5523
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:04:29 2017 +0100
Merge pull request #1630 from boutinb/development
Sync dataAutoSynchronization changes with watcher
commit b66ac3b5f2ed22102bad3effe56ae09ed34ea406
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 13:03:31 2017 +0100
Change default application folder different platforms
For OSX, Windows, Linux a different application folder is selected
commit 82db55230c11c3717d729cdee7b2f0654027df97
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:02:18 2017 +0100
Sync dataAutoSynchronization changes with watcher
commit 9639f7c4f9956bad4d340d0be12bf718cd35ea7b
Merge: 305ec5cf c3c3433c
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 12:36:56 2017 +0100
Merge pull request #1629 from boutinb/development
Remove cvs association with JASP
commit c3c3433cf2be7a0526271f299dbc2566eb4ba221
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 12:36:21 2017 +0100
Remove cvs association with JASP
commit 305ec5cf1a1eda29dfa56fa7e13d463ebb9e7092
Merge: 8db18b08 e0272af0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 09:26:56 2017 +0100
Merge pull request #1628 from FransMeerhoff/update_testfiles
Add new JASP testfiles
commit e0272af0c43c7c5f24759ee0f735e84d5ae07fa7
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 23:14:01 2017 +0100
Add new JASP testfiles
Added
testFileANOVA_RM.jasp
testFileCorrelation.jasp
commit 8db18b0884a93dc674fe402c4d84345682babae4
Merge: 81418f2a c3ec3d57
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 17:49:15 2017 +0100
Merge pull request #1627 from FransMeerhoff/preferences
Add Preference Dialog
commit c3ec3d57d2495937ff0bca953807443609e07d43
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 00:32:12 2017 +0100
Add Preference Dialog
A preference dialog is added for synchronization parameters.
commit 81418f2ab4c64b8ec0ae82f9eeb4ae35c75d47d4
Merge: b66a43e1 5d332033
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 17:13:47 2017 +0100
Merge pull request #1626 from boutinb/development
Add edit feature by double-clicking the data
commit 5d3320335659fc3a6070f8669f659e38a65b5f30
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 17:12:14 2017 +0100
Add edit feature by double-clicking the data
commit b66a43e10686f31ab73aaad260ff19dee10dc117
Merge: 2be6bebd 444066f7
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 15:54:22 2017 +0100
Merge pull request #1625 from akashrajkn/bugfix
Bugfix
commit 444066f72c3930b29b169661d672a61ea4ea19d6
Author: akashrajkn <akashrajkn@gmail.com>
Date: Tue Feb 14 15:48:35 2017 +0100
remove previous error in the output
commit f1b7e2def77dac272a1fd4978269baa007ad639c
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Feb 10 13:20:11 2017 +0100
innerHTML QString bug fixed for linux build
commit 2be6bebd0a24c82c7c9d6259432b71313441d539
Merge: d79ba2a5 8183a1cb
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 12:01:45 2017 +0100
Merge pull request #1623 from FransMeerhoff/development
Bug Variables Window
commit 8183a1cbfc4cf20923f280a2548ffe8523dd5385
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 9 17:45:36 2017 +0100
Bug Variables Window
When clicking on a column not counting values JASP crashes
commit d79ba2a558740a993ac96562661c926ee2221f8e
Merge: c71c2a54 8a5a9a44
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Feb 10 16:32:00 2017 +0100
Merge pull request #1619 from AlexanderLyNL/development
Added: p-values to SumStats module
commit 8a5a9a442e244a66f23168ea88b94f613905ed73
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Feb 9 22:40:02 2017 +0100
Added namespaces to some functions
commit c71c2a5408ac2b5c61ef9ccc5f0f649f1c591576
Merge: b71029a4 fc766abe
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:23:00 2017 +0100
Merge pull request #1621 from FransMeerhoff/development
Update JASP Testfiles
commit b71029a4b5e0ac85eab02c6188a2a4428ce45af2
Merge: 68760b53 467dbeb3
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:22:41 2017 +0100
Merge pull request #1622 from boutinb/development
Add Labels from SPSS
commit 467dbeb346ee992c402a0f89cce9564c1ed8aa4f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:17:40 2017 +0100
Add Labels from SPSS
commit fc766abe2f28fbbba9beade6b67bec3af74543f2
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 8 16:52:00 2017 +0100
Update JASP Testfiles
Added :
BayesContingencyTables.jasp
BayesLogLinearRegression.jasp
FreqContingencyTables.jasp
FreqLogLinearRegression.jasp
SumStatsModule.jasp
ReliabilityAnalysis#1613.jasp
commit fb5779bf74325a02d3ab233696e03c952282845f
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Feb 8 14:53:54 2017 +0100
pValue in SumStat - Kendall's tau
Avoid SuppDists for the moment and use approximation instead.
TODO: Add SuppDists package in the library.
commit 68760b53ad6cdcb488d227bdea4b88b97d7fc7b9
Merge: b823e0bb 783a616f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 14:32:01 2017 +0100
Merge pull request #1620 from JohnnyDoorn/development
Updated post-hoc tests for repeated measures anova
commit 783a616fbceb2682d889570ea0be60cb500420da
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Feb 8 14:08:51 2017 +0100
Ancova: changed two names, so the plot sizes adjust when either width or height are adjusted.
Repeated measures: Fixed post-hoc tests issues - changed pooled error to unpooled error
Repeated measures gui: made bonferroni the default test
commit a83164ca48360108d4a1dd78499061128d4b7e18
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Feb 8 12:19:47 2017 +0100
Added: p-values to SumStats module
Added p-values to sumstats
commonsummarystatsttestbayesian
- .pValueFromT output to a list producing all three p-values at the
same time
Checked all dependencies on the repository.
- summarystatsttestbayesianindependentsamples.R
- summarystatsttestbayesianonesample.R
- summarystatsttestbayesianpairedsamples.R
Add: .pValueFromCor output a list
summarystatscorrelationbayesianpairs
Change: correlation output title for Kendall from “t” to “tau"
TODO:
- Discrepancy between cor.test method=“kendall” and the SuppDists
package
- Add SuppDists package to library
- Change plot functions for it take bfObjects
commit b823e0bba28da444c5803b4c53b787e9fdd8a3b1
Merge: 613773f8 dd82c184
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 09:38:44 2017 +0100
Merge pull request #1618 from boutinb/development
Do not warn user if sync data file does not exist.
commit dd82c18499bf5cd58878e8550490711832b694eb
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 09:38:03 2017 +0100
Do not warn user if sync data file does not exist.
commit 613773f898171880a05ec36114faceee2e26d839
Merge: 9b5e361f 86e2a54c
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 17:14:32 2017 +0100
Merge pull request #1617 from boutinb/development
Clear default options of analyses when closing file
commit 9b5e361f1400ba51d4c20b259833cc44739abe55
Merge: adb6e8d0 2cbfc171
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 17:14:13 2017 +0100
Merge pull request #1541 from vandenman/ReliabilityUpdates
Reliability Analysis: Bug fix, Error handling and added Average inter item correlation.
commit 86e2a54c1c5d1a8f6243d45e6757e248eb49f9be
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 17:01:04 2017 +0100
Clear default options of analyses when closing file
commit adb6e8d0df29094fc31de750426c337f9d0838ef
Merge: 1c152d8d c6cd6535
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 16:38:15 2017 +0100
Merge pull request #1599 from TimKDJ/bugfix/bayesianttestscaleparam
Fixed the scale argument of the credible intervals
commit 1c152d8d2947978e84595df697e47c1f6243e713
Merge: 5bef06fd 1c31f53e
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 16:37:07 2017 +0100
Merge pull request #1614 from boutinb/errorCheck
ErrorCheck
commit 1c31f53eb2ef47e7c94485f8f8671fd040660e78
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 16:35:24 2017 +0100
Small bug fix in levels check
commit 99ac8e086d13fa687609d9bdaf4e26683d8c7e45
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 16:28:56 2017 +0100
Set alert icon when exception and info icon when error
commit 7db2b5c5a40287defd22cd5790b1048576aa12ee
Author: TimKDJ <tim_jong@hotmail.com>
Date: Tue Feb 7 12:20:41 2017 +0100
Functionality to RM GUI
commit 047e9e2017b59e29b27ca090eee68443b42e896e
Author: TimKDJ <tim_jong@hotmail.com>
Date: Tue Feb 7 11:19:08 2017 +0100
Added UI for RM, made plots adaptable to within analysis changes
commit 3069af8715070331d2257a317a08ee099d335a0e
Author: bruno boutin <b.boutin@uva.nl>
Date: Mon Feb 6 11:44:24 2017 +0100
exception get 2 line border
commit b56f0291719f007a2d5509a141fb9e4d13c3e427
Author: TimKDJ <tim_jong@hotmail.com>
Date: Fri Feb 3 16:50:59 2017 +0100
R/json RM ANOVA descriptives
commit 85e3527ca26bd19abcd274bbc26a847c3cc2fc27
Author: TimKDJ <tim_jong@hotmail.com>
Date: Fri Feb 3 16:08:31 2017 +0100
Descriptives for the ANCOVA
commit 9a432343d83eb687db7a23d50dfc0411cb927126
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 2 18:13:38 2017 +0100
Set the error in front of the previous result
commit d6375d21e18b547d4de503636d2ae2ea428799e2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 2 17:34:53 2017 +0100
Add contrast between rows in table
commit 5eb1b587ec1eb218bc58936d8cdb9958dba1ce34
Author: TimKDJ <tim_jong@hotmail.com>
Date: Tue Jan 17 16:10:46 2017 +0100
Improved grouping functionality, simplified args in subfuncs, added support for vectorized args
commit d62eae2a73d29bd3ed8ae468853238cd2c41bae8
Author: TimKDJ <tim_jong@hotmail.com>
Date: Wed Jan 11 18:14:52 2017 +0100
Changes to stacktrace, added slider support
commit 9e11c3462cc811f3ff51c77e375993fb262bd73e
Author: TimKDJ <tim_jong@hotmail.com>
Date: Wed Jan 11 11:24:47 2017 +0100
Make error an exception
commit 8e9d1bc82556229424bc7ef2146e89b169ef39e0
Author: TimKDJ <tim_jong@hotmail.com>
Date: Fri Jan 6 12:53:21 2017 +0100
Make grouping line selective
commit a906a5c0efb80e30bf38d5c74750af0614ec4dcc
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Jan 5 18:08:32 2017 +0100
Added: grouping levels support, ability to use 'all.', improved the checks
commit d619de6b16070913d69958ad4d4056f29f798329
Author: TimKDJ <tim_jong@hotmail.com>
Date: Sun Dec 18 11:15:02 2016 +0100
Added support for expected errors, stack traces; changed variables in messages
commit 5bef06fda262737f1eb22e4b00187f6589bcc39c
Merge: 4ae07d08 c0b39225
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu …
boutinb
pushed a commit
that referenced
this pull request
May 9, 2017
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
* Added missing value handling and Greatest lower bound
In addition: some minor code cleaning (changing `=` into `<-` ); added a
footnote warning a user that three or more variables are required for
the glb; using a try construction for the glb since it is error prone.
TODO: check why psych::alpha(d, key) can run while psych::glb(d, key)
errors for the same input.
* Fixed try-errors and added warnings in footnotes
made use of common function isTryError instead of inherits. isTryError
does not use "inherits" which could be a problem for objects with
multiple classes.
* Changed Advanced Options to autohide
modified advanced options box to have a container and modified cpp file
to hide said container.
* Fixed typo + bug fix
Fixes https://github.com/jasp-stats/jasp-desktop/issues/1761 and now
throws an error message when less than 3 valid observations are provided
(instead of breaking down).
* see previous
* improved code after review
Tim's `exitAnalysisIfErrors = TRUE` removes some code.
Alexander's Readability suggestions.
glb with reverse scaled items is still error prone.
.vdf should be read as numeric (everything should always be numeric in
the reliability).
* Squashed commit of the following:
commit 4a7c0a87157b2b27d44ae2ac4d3e46a5b1d301c0
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon May 8 13:43:19 2017 +0200
improved code after review
Tim's `exitAnalysisIfErrors = TRUE` removes some code.
Alexander's Readability suggestions.
glb with reverse scaled items is still error prone.
.vdf should be read as numeric (everything should always be numeric in
the reliability).
commit 458a63354de0aeb254ef2a9641e29febe78b1d4a
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 18:25:29 2017 +0200
see previous
commit 6ee527e1754442eb9dd674f64bbe3d181bdce9ec
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 18:25:15 2017 +0200
Fixed typo + bug fix
Fixes https://github.com/jasp-stats/jasp-desktop/issues/1761 and now
throws an error message when less than 3 valid observations are provided
(instead of breaking down).
commit 5a35d1d16d955209b1fd58e5680b84e9f2be5cef
Merge: 55d4db45 3dfcef87
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 17:46:52 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 55d4db45f901430815cc68bdf84dfdee3573def5
Merge: b5463965 cd2c7d5e
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 16:26:46 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 3dfcef87d40700d6531adcc68d3f354737e55396
Merge: b80be165 3d1c4051
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 18:25:01 2017 +0200
Merge pull request #1760 from boutinb/development
Synchronization with paired variables analyses does not refresh
commit 3d1c4051aed80852f5102adac28e87036e6f88ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 18:23:49 2017 +0200
Synchronization with paired variables analyses does not refresh
commit b80be16578ba6c75f29d36936fe2afa803ede1dc
Merge: b50c7a06 530c3fcc
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 12:00:24 2017 +0200
Merge pull request #1759 from boutinb/development
Multi level table must have beter layout
commit 530c3fcc8f24db4ef2baefe238cb41016b72eb0c
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 11:58:41 2017 +0200
Multi level table must have beter layout
commit b50c7a06f580e605f827046b323b175bc9d935af
Merge: 15670b4d 823c3c4e
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 10:56:00 2017 +0200
Merge pull request #1758 from TimKDJ/development
Bugfix printing eps
commit 823c3c4e800fd1cf35ff2d36f539b70442d87008
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Thu May 4 10:52:54 2017 +0200
Bugfix printing eps
JASP crashes if you print the state with an image in it (I will try to
find out what’s wrong exactly)
commit 15670b4d6e920d11c73abccd06e248398d0757dd
Merge: cb0732a8 7596aaa2
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 14:25:47 2017 +0200
Merge pull request #1751 from TimKDJ/upgradeR
Reapply earlier commit and add R v3.3 functionality
commit 7596aaa29a358ee53592352667b8d78af6c38573
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed May 3 14:21:00 2017 +0200
Changed variable notation
commit cb0732a88d6ee876f0307de86fc9de82a56e8f5b
Merge: 8c3de5c2 9d312c75
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 11:33:22 2017 +0200
Merge pull request #1755 from quentingronau/subjectiveBayes
SubjectiveBayes
commit 9d312c7597ffb57be699e761e262a6e54e1ba929
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Wed May 3 11:31:53 2017 +0200
minor changes to informed Bayesian t-tests
commit 8c3de5c2e80abdf17d3935a1debda8b0b0f3ac08
Merge: 06317e66 b316f2e4
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 10:43:42 2017 +0200
Merge pull request #1754 from vankesteren/fix_names
Edited the labels of VS-MPR in UI
commit b316f2e45808511793a0fce26f313f26a699f975
Author: vankesteren <erikjan.vankesteren@gmail.com>
Date: Wed May 3 10:00:09 2017 +0200
Edited the labels of VS-MPR in UI
As per request of EJ
commit 06317e666681b4b0f4c30425c9af79d7b019fe34
Merge: cd2c7d5e 7b09c790
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed May 3 09:27:39 2017 +0200
Merge pull request #1745 from AlexanderLyNL/development
(1) correlationBayesian and correlationBayesianPairs: fixed up Tim's error handling (2) regressionLogLinearBayesian: small bug fix
commit 0a6d37afb418dddb31efc5e1906056456226f25f
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 15:37:09 2017 +0200
Change UI of SubjectivePrior And fixed % error bug
commit a2edd4b5d235e7623590a3934cdf8d220aaf4f36
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 14:05:32 2017 +0200
Remove spaces in log function
commit 973bd8d3f8849f01b0cf36d2fa793faf74ef2f79
Merge: 69832ac2 cd2c7d5e
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 13:57:13 2017 +0200
Merge remote-tracking branch 'upstream/development' into subjectiveBayes
commit 7b09c7904af45fd809c89180e10c910d063338a7
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue May 2 12:37:27 2017 +0200
Added comments and fixed up state order for variable names
commit 69832ac2d19e62dfb0408ec30be788634296e615
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 11:24:05 2017 +0200
added informed t-test functionality to common
commit ac190dc06c733bb1d7bc769c2fe2738e04bdaded
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sun Apr 30 10:22:01 2017 +0200
Bayesian loglinear regression fixed
Correlations:
- added argument for failure, so call bfObject$stat make sense
Log linear Bayesian:
- NA screening using anyNA this is faster
- default and minimum models now is 2
- call in Overstall’s package should be $table$prob$Freq
- TODO: Add memory
commit cd2c7d5e1313a7cd8c6121508f53b22c255d0acc
Merge: 0eb05225 862a5ef0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 26 08:53:52 2017 +0200
Merge pull request #1748 from JohnnyDoorn/development
Fixed some minor issues in t-test
commit 0eb0522518a66557ece8943f3d15fb55e847de4b
Merge: 99468f9f 21513bb2
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Apr 25 21:19:14 2017 +0200
Merge pull request #1750 from TimKDJ/bugfix/contingencyTables
Bugfix Contingency Tables
commit 21513bb253a5ecf4b9455d02a1a2f04ddb78f4ab
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Tue Apr 25 14:49:49 2017 +0200
Bugfix package upgrade, robustness .clean
commit 862a5ef0c099d701b107198de2536a65cb5a1986
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Tue Apr 25 14:18:52 2017 +0200
fixed the wording in the t-tests
now it has proper names, hypotheses are specified correctly
removed incorrect cohen's d for one-sample t-tests
commit 682fbf8317b2c43b1d0d3e62b82efe88be7e22f6
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 16:03:06 2017 +0200
Bug fixed object naming
At the wrapper level, i.e.,
- .bfPearsonCorrelation
- .bfKendallTau
I now include the result$stat entry to uniformly have the result. It
didn’t make sense for a .bfKendallTau object to have as argument
bfObject$r. When programming for Kendall’s tau, just retain tauObs in
the code, that is, in .bfCorrieKernelKendallTau etc etc
commit 96d84b39c4b6c31cf7740ba3785f4efaef644108
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 15:04:59 2017 +0200
Fixed up Tim's error handling
Removed tracking lists to store in state (memory)
- rValuesExcludePairwise
- footnotesExcludePairwise
- footnotesExcludeListwise
Footnotes and rvalues are now stored in the object, no need to track
more things
Name change:
new: memoryExcludePairwise
old: bfValuesListExcludePairwise
new: memoryExcludeListwise
old: bfValuesListExcludeListwise
Style:
Some style stuff in regressionloglinear.R
commit 99468f9f2d4423084c07efac6b51fdb5603f3793
Merge: 5e2ffda9 72beca7e
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 15:03:49 2017 +0200
Merge pull request #1744 from TimKDJ/bugfix/bas
Bugfix development version (BAS module)
commit 72beca7e696b9dbbd82c2f0acd64a74fbf3c7ed7
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Mon Apr 24 14:16:58 2017 +0200
Removed random d
commit 938cfa7d8b16e670814b2187d8ca5f49108d880f
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Fri Apr 21 22:14:19 2017 +0200
Revert earlier commit and add R v3.3 functions
commit 5e2ffda9a9ad25fc4d6f92ac77a68dcf31bb6378
Merge: 3df268b4 5902ac10
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Apr 21 13:36:41 2017 +0200
Merge pull request #1741 from akashrajkn/BAS-development
Added BAS Regression (development version)
commit 5902ac10d949e8d510f57b114180ec73d6ce65e3
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Apr 21 16:11:04 2017 +0530
Added BAS Regression (development version)
commit 3df268b43078e5986264c979aa3f699898bca39e
Merge: 9d350d4d 4d48aa82
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 20 11:47:08 2017 +0200
Merge pull request #1740 from akashrajkn/bugfix
Added ellipses to handle parameter variablility
commit 9d350d4d0c1945e61647cd63d44e10150933bd17
Merge: dbd0d21e 2dbfb6ac
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 20 11:46:39 2017 +0200
Merge pull request #1735 from AlexanderLyNL/development
(1) credible intervals Bayesian correlation matrix and Bayesian corre…
commit 3cc33cef3a3e79b5db631ebfa38defdc6f13c8ce
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 13:00:10 2017 +0530
UI improvements to subjective priors widget
commit eacb873e4c21cc0e07d0ec28847949c59bef723d
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:59:48 2017 +0530
Added subjective priors to Bayesian TTests
1. subjectivePriors widget added to independent and paired samples ttest
2. added priors to the json file
commit 484c4c2d800467f3bf2d67e7580938fdcabc446e
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:33:04 2017 +0530
Replaced prior layout with SubjectivePriors widget in one sample ttest
commit d16dfa6242ff14f18e439a29233a385063022ca3
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:29:01 2017 +0530
Created subjective priors widget
commit 18d753c794db85baff987beb4f91a2e8b4ff2a18
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Feb 10 17:02:21 2017 +0100
Added prior options to ttest one sample
Created layout for Subjective Bayes
commit 2dbfb6ace84d274d27e8bbc333a13500396e70da
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 10:27:37 2017 +0200
Style changes and removed .Rhistory file from pull request
- Removed .Rhistory
- Style:
new: ) {
old: ){
new: if (..
old: if(..
new: else {
old: else{
commit fe05c882d0ab0da1fff78c40946abbbd227be22a
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 08:53:24 2017 +0200
Style: removed spaces LogBF10
commit f8c1fe670fb65dafbcfa929a5328cdacc2fbe7cc
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 08:33:38 2017 +0200
Style: Grammar changes
1. Removed spaces of logBF10,
2. Style change table headers in the t-tests:
- new: Statistic, old: statistic
- new: Confidence interval, old: Confidence Interval
commit 4d48aa822296e08e42e6ec3ea311b4b95d22b91f
Author: akashrajkn <akashrajkn@gmail.com>
Date: Wed Apr 19 21:43:55 2017 +0530
Added ellipses to handle parameter variablility
commit dbd0d21e864244b569b94ab45767fc3b6ad7d82e
Merge: 94eb0ab8 a44fa29c
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 19 16:39:50 2017 +0200
Merge pull request #1739 from JohnnyDoorn/kaas
Fixed Cohen's d
commit a44fa29cde3338eb89fcb716157af07774ca5005
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Apr 19 16:26:55 2017 +0200
Fixed Cohen's d
commit b5463965898d6511fca877d7404b14dd2b87e3c4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Apr 19 15:05:26 2017 +0200
Changed Advanced Options to autohide
modified advanced options box to have a container and modified cpp file
to hide said container.
commit 7c5b8ed29153cd0fb0e0eeacbec382ff55639553
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Apr 19 13:29:11 2017 +0200
some style changes
commit 94eb0ab887169798cd77e019ea5a389e749f933a
Merge: b6149a14 9db8691c
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 19 11:53:29 2017 +0200
Merge pull request #1736 from boutinb/development
Make About box selectable
commit 9db8691c86090269c2768410fa28609e96e51380
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 19 11:33:57 2017 +0200
Make About box selectable
commit 2ab7e7ce80f4995b1fd7db4ecdc602bb839d4802
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Apr 19 11:04:39 2017 +0200
(1) credible intervals Bayesian correlation matrix and Bayesian correlation pairs, (2) p-values for sumstat Kendall's tau
R changes:
- give sensible p-values and BF for Kendall’s tau when n <=2
- Only partially cleaned up correlation.R
- added isTRUE in code for robustness reason
- Removed additional layer in the bfObject when it comes to ci. Check
for ci goes via bfObject$ciValue, say, 0.95, and the intervals are in
bfObject$ci$twoSided, bfObject$ci$plusSided, bfObject$ci$minSided.
- Example: bfObject$ciValue <- 0.95 and bfObject$ci$twoSided <- c(-0.3,
-0.2, 0.1). Tells me that the 95% CI is from -0.3 to 0.1. The point
-0.2 is the median.
Style:
- reordered the input in kendall tau functions, first data, then
parameters then hyperparameters: Data: n, tauObs. Parameters: tauPop,
Hyperparameters: kappa, var=1
- .bfKendallTau is a wrapper around .bfCorrieKernelKendallTau.
Basically, it switches between various methods and various variances
- Removed double function definitions in .correlationbayesianpairs.R
- renamed functions: (1) .credibleInterval to
.computePearsonCredibleInterval
UI son and ui, cpp:
- Bayesian Correlation matrix and pairs now have button for credible
intervals <- slot is called “credibleInterval” which is true or false,
percentage is now referred to as “ciValue”
commit b6149a14bc09db08a2680e37f50221b8aab38a99
Merge: c925a5ce badb8ee4
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Apr 18 09:51:36 2017 +0200
Merge pull request #1656 from SachaEpskamp/development
SEM udpates
commit 5c1f3051813af317c84adfea34f238c0c0363168
Merge: b41a15b8 c925a5ce
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 14:00:54 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit b41a15b839368a304a65eff3b75364ab30bed80c
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 14:00:38 2017 +0200
Fixed try-errors and added warnings in footnotes
made use of common function isTryError instead of inherits. isTryError
does not use "inherits" which could be a problem for objects with
multiple classes.
commit 07fffe34ac7194a289c3ae067438c93b91ae2db9
Merge: 1c5b7b02 3883a241
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 12:36:08 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit c925a5cebd06a309b95ac3d6652a9ea575c08bce
Merge: c65e4b6f 07b2ee9f
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:21:56 2017 +0200
Merge pull request #1732 from FransMeerhoff/development
Prepare 0.8.1.2
commit c65e4b6f3dbca866f873371e4a1932aea14c9e10
Merge: 205ae4ae 7ec8ce98
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:21:04 2017 +0200
Merge pull request #1733 from boutinb/development
Make even rows more grey and keep them grey when they the table is not selected
commit 7ec8ce9818967ea877e810dfe95b4133e4af844c
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:13:41 2017 +0200
Make even rows more grey and keep them grey when they the table is not selected
commit 07b2ee9fa1ecd612ec200adb69ff3902ec3de1b6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Apr 13 15:57:37 2017 +0200
Prepare 0.8.1.2
Update version numbers
commit 205ae4ae9677851cdee941f59b971571b7169db0
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Thu Apr 13 13:58:14 2017 +0200
New pull request to add tims error handling to correlation (#1731)
* Added Tim Error Handling
Fixed issue #1677 with ANOVA table
* Added Tim Error Handling
Fixed issue #1677 with ANOVA table
* Merge branch 'development' of https://github.com/JohnnyDoorn/jasp-desktop into development
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
commit e62c15dd955f99e6b192c589c7bdae194c659610
Merge: fd051890 a91ef1a7
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 17:34:04 2017 +0200
Merge pull request #1726 from FransMeerhoff/development
ggplot2 problem
commit fd0518900d311eed56cf4c25464e0d29dce7ece1
Merge: 9025224d 17165d72
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 17:33:20 2017 +0200
Merge pull request #1730 from TimKDJ/development
Improved state retrieval
commit 17165d72f563db250ef8e0f1b981d95b4032ad82
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed Apr 12 17:29:29 2017 +0200
Improved state retrieval
commit badb8ee4a7df986a724a3aadd0063d244f439e51
Merge: 60a7e194 9025224d
Author: Sacha Epskamp <sacha.epskamp@gmail.com>
Date: Wed Apr 12 17:00:22 2017 +0200
Merge branch 'development' into development
commit a91ef1a771bf9f6f9a314cc5ff4ea9eaff5df9f1
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 12 14:28:36 2017 +0200
ggplot2 problem
Principal Component Analysis and Exploratory Factor Analysis called
ggpltot2::theme with multiple argument
commit 9025224d759e369c090f10e39a09965b13699876
Author: Erik-Jan van Kesteren <erikjan.vankesteren@gmail.com>
Date: Wed Apr 12 16:28:31 2017 +0200
Save Image As - functionality (#1727)
* Add Save Image As EPS/PNG feature
* Add Save Image As EPS/PNG feature
* SaveImage clean code step 1
* test
* Edit hack solution
* remove warning
* SaveImage edits: remove width & height in cpp
* New redrawplot function
* Read height & width + overwrite possible
Also includes a dpi conversion fix
* Clean saveImage code & implement in descriptives
* Add saveimage menu option only if convertible
* tab align small fix
* Re-perform fix boxplot error bar width
* Stricter convertible functionality js
* Add documentation to /docs/development
* Rename documentation
* update md, add convertible img to ttest
* Add parsing convenience functions & adjust
.imgToResults and .imgToState
* Update saveimg documentation
* test change don
* test change back
* start on Anova
* deleted commented code
* more commented code deleted deleted
* t-test plot convert for saveimage
* Anova is now fully functional. Note that `convertible = TRUE`
* start on Anova
* deleted commented code
* more commented code deleted deleted
* Anova is now fully functional. Note that `convertible = TRUE`
* Updated all analyses with quick fix for eps figures
in EFA and PCA: Path diagram gives an error because library magrittr is
missing. Summary stats functions error because .extractErrorMessage is
missing.
* additional changes and backwards compatability with previously done analyses
* binom test first implementation eps
* Add tiff
* Cleanup EPS implementation
State logic moved to common
* Cleanup EPS implementation
* Overwrite png possible, cleanup descriptives
* Reintroduce lost "extracterrormessage" function
* fix bug plotfunc in summarystats
* dpi fix
using png device and dev.size()
* Fix dpi scaling issue
* Fix ggplot2 backwards compatibility
commit d6d7c2791093ea185ddd76dff3374ef280b84931
Merge: 65c9c14a 68b19b4e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 16:26:18 2017 +0200
Merge pull request #1728 from boutinb/development
Better SPSS synchronisation
commit 68b19b4eb49599beca9ac1338932d0931e7edc37
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 16:06:45 2017 +0200
Better SPSS synchronisation
commit 65c9c14a208ba9a999789ca081a81f00a2e17a77
Merge: c12f9055 a49df5cc
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 13:54:09 2017 +0200
Merge pull request #1723 from FransMeerhoff/r_upgrade
Enable R 3.3
commit a49df5cc366687402cea40e0dd7c3102dea2640d
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Apr 11 19:10:45 2017 +0200
Update jasp-building-guide.md
Fixed up broken links due to spaces
commit c12f9055d80511395aaf9c0f1da72efaa4ddfa26
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Apr 11 19:10:45 2017 +0200
Update jasp-building-guide.md
Fixed up broken links due to spaces
commit d989b6e3dc81fa58a65513351d10165bd9ca769f
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Apr 6 14:32:38 2017 +0200
Enable R 3.3
commit 3883a2416c8f0621c9c52d58730c1b245b70ba36
Merge: a9209d8a 009c4b65
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 11:18:50 2017 +0200
Merge pull request #1717 from boutinb/development
Add tooltip to the Anova Model Widget to help make interactions
commit 009c4b65a1c123c46669d0df2955a9b2658c6678
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 11:04:48 2017 +0200
Add tooltip to the Anova Model Widget to help make interactions
commit a9209d8af0fa63c1113906b4e41b5c0e68798792
Merge: 5ec73983 b10a74a8
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:36:09 2017 +0200
Merge pull request #1707 from TimKDJ/bugfix/NALevel
t-test fix
commit 5ec739835848955985e0fcd5cd92a5e6306710f4
Merge: 8af04853 66dc1d5a
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:34:56 2017 +0200
Merge pull request #1709 from jasp-stats/TimKDJ-patch-2
Added state explanation
commit 8af04853aad4b2f1a99f6d74b65b8feed92a9b99
Merge: 8fe3c188 dd739671
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:34:35 2017 +0200
Merge pull request #1712 from TimKDJ/feature/BestModelTop
Compare BayesFactor output with best model
commit 8fe3c1887260f2c36af8c955db7833ef573b6007
Merge: dd87f95a 4adfaba2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:16:33 2017 +0200
Merge pull request #1716 from FransMeerhoff/r_upgrade
Add RInside code to JASP-Engine
commit 4adfaba27704b003d9962463b6a1fd448b668702
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 2 17:22:00 2017 +0100
Add RInside code to JASP-Engine
The cpp code from the RInside package is added to the JASP-Engine.pro
commit 66dc1d5a11891f7c04f4509aabbeb64b531b0c7c
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Thu Mar 30 15:38:07 2017 +0200
Added state explanation
commit b10a74a896abf0e49f56f042d5a4ac048d2171a7
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 30 13:00:47 2017 +0200
Fix to NA levels and minimum obs amount
commit dd739671e40794215b99a337e740322fc72a9b96
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 30 10:52:51 2017 +0200
Best model top
commit dd87f95a039313b4284fda8e7481e3a4ef2f5a02
Merge: 0259ccef aba7aad6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 10:28:54 2017 +0200
Merge pull request #1706 from FransMeerhoff/development
Typo issue template
commit aba7aad67fa9dc0564ed5188d7d6d6e3119a76e7
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 09:47:21 2017 +0200
Typo issue template
Typo issue template
commit 0259ccef391eca417a8e6165678dc135e93fe1e4
Merge: 0e2645fd 2973e181
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 30 09:44:10 2017 +0200
Merge pull request #1705 from FransMeerhoff/development
update issue template
commit 2973e18127f6082dde9a0c4cb9b414832428373a
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 09:37:29 2017 +0200
update issue template
Make a distinction between enhancement request and bugs
commit 1c5b7b02414f7275dfe06629f679418d0355d59f
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Mar 29 00:08:15 2017 +0200
Added missing value handling and Greatest lower bound
In addition: some minor code cleaning (changing `=` into `<-` ); added a
footnote warning a user that three or more variables are required for
the glb; using a try construction for the glb since it is error prone.
TODO: check why psych::alpha(d, key) can run while psych::glb(d, key)
errors for the same input.
commit 74b147ce9f7d747f0254d4d74d8fdbaaa88b8c6d
Merge: edd69b08 acb373f2
Author: vandenman <donvdbergh@hotmail.com>
Date: Tue Mar 28 19:48:53 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 0e2645fda85af6299911cefcdd66d5a21fcaf5b5
Merge: acb373f2 c6aaef1e
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 28 10:38:29 2017 +0200
Merge pull request #1701 from boutinb/development
About box on Mac does not work
commit c6aaef1e4dca136d0ac551fd24bcb9ca02950d23
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 28 10:32:08 2017 +0200
About box on Mac does not work
Solves #1700
commit acb373f23dccbf87c66f49beb6cdc13dbcdd426c
Merge: 794b38f8 4ee4569b
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:49:20 2017 +0100
Merge pull request #1686 from silberzwiebel/development
Added build instructions for Fedora
commit 794b38f84957a5078a69d8f4ad023b884af835fc
Merge: 04df2733 638d60c5
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:48:51 2017 +0100
Merge pull request #1688 from akashrajkn/fix/summary-stats
Fixed the BF10 bug in posterior plot
commit 04df2733894186b825a1dd6b7f518482088eaaa4
Merge: b6e11ded 88cf26ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:46:17 2017 +0100
Merge pull request #1696 from boutinb/development
Crash when open a JASP file after closing another one
commit 88cf26ed0ee086a625c2b84896f1e73a23be709a
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:44:50 2017 +0100
Change variables can crash when an analysis was deleted
commit 41b8512d1293f78dcceea4c9650b1ecd85ef4aad
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 22 10:57:11 2017 +0100
Crash when open a JASP file after closing another one
When closing, the analyses must be internally deleted.
commit b6e11deddb7a5b4fc5045fa3a0f840a44f5f1e0f
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 21 14:24:53 2017 +0100
Remove TestFiles.zip from installer in mac
commit b8bfd96dcd18cd39ef9fafa9113c12fd6d69df1f
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 21 12:12:16 2017 +0100
Set right citation for analyses
commit 638d60c51e7dcef8487ceb97289a0403f344eda1
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sun Mar 12 10:30:55 2017 +0530
Fixed the BF10 bug in posterior plot
commit 4ee4569bc25839b06d733ff41035e7e2ef8a6cb5
Merge: 00905323 9981ad9c
Author: silberzwiebel <silberzwiebel@users.noreply.github.com>
Date: Fri Mar 17 09:26:17 2017 +0100
Merge pull request #1 from silberzwiebel/silberzwiebel-patch-fedora-build
Added build instructions for Fedora
commit 9981ad9c8576478b8487dd8ae3baee1b5f04dcb2
Author: silberzwiebel <silberzwiebel@users.noreply.github.com>
Date: Fri Mar 17 09:25:24 2017 +0100
Added build instructions for Fedora
After I had some troubles some months ago (see https://github.com/jasp-stats/jasp-desktop/issues/1507 ) I wanted to look at the new release and managed to compile it under Fedora using these instructions. I thought, they might be better in a central place then only at my PC.
commit 00905323a97e1e4200d9740244e69bcef2285e93
Merge: b09e227a eb3e376d
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 17:31:07 2017 +0100
Merge pull request #1685 from TimKDJ/bugfix/levelCheck
Omit NA's from the factor level check
commit eb3e376d827aaeb1b2b573071dc00770010d4876
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 16 17:24:50 2017 +0100
Omit NA's from the factor level check
commit b09e227a5e3375770ca39d2ae5b64195c9fffd24
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 16:53:35 2017 +0100
Set Version for 0.8.1.1
commit 1951c8d4df2645a9e2f09063c6f5f47cc971b37e
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 16:49:44 2017 +0100
Fixes #1672: JASP crashes loading CSV
commit a3dc1fa83e22d947103dcb75ced20567b6bea0d0
Merge: 892647e5 343d3c34
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 16 15:56:57 2017 +0100
Merge pull request #1679 from AlexanderLyNL/patch-2
Update r-style-guide.md
commit 892647e5f3abdee5a50655a50a6caf096298b5c7
Merge: 7c2f7b9e 0288beda
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 16 13:34:28 2017 +0100
Merge pull request #1680 from AlexanderLyNL/development
Small init bug fixed
commit 7c2f7b9e6785de58a358c38ccb58d68cd8421ddc
Merge: 8ad4fb87 e3313818
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 10:04:37 2017 +0100
Merge pull request #1681 from akashrajkn/issue-template
Added ISSUE_TEMPLATE
commit e3313818c736d8da228a879316b53232a064ba54
Author: akashrajkn <akashrajkn@gmail.com>
Date: Thu Mar 16 11:12:28 2017 +0530
Added ISSUE_TEMPLATE
commit 0288beda9618c994d67db67798159d51aaa617a9
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 22:24:55 2017 +0100
Added comments to code
commit a3429f4ff7862b5a07e1bceb549ebe2842be487a
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 19:01:15 2017 +0100
Small init bug fixed
commit 343d3c34774a7c5e7103276fc0e1579cf11b0769
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 17:25:21 2017 +0100
Update r-style-guide.md
commit 8ad4fb87e731049d2dcddbd53648055c32ec39bd
Merge: 90d7b273 7d26deec
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:52:33 2017 +0100
Merge pull request #1659 from TimKDJ/bugfix/slowBayesianAnalyses
Solution for the slow Bayesian init
commit 90d7b273c371895acc9eb9b3463abcd9a8c557ca
Merge: 4a45854d 649f2ad9
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:50:11 2017 +0100
Merge pull request #1673 from AlexanderLyNL/development
Added dormant replication BF for the correlation, cleaned out code
commit 4a45854ddc848e41207ba5b4cc76bdde95b76cb3
Merge: 47387245 09319845
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:48:51 2017 +0100
Merge pull request #1676 from FransMeerhoff/development
Generate log file on Windows
commit 649f2ad982d6ca424b33d776c1f9330591a290ac
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Mar 14 22:07:02 2017 +0100
added some small remarks in the style guide
commit 093198451b0c1cd36279ade918ca93ce2aeed7a1
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Mar 14 16:35:07 2017 +0100
Generate log file on Windows
Enable giving output on windows by starting JASP from the command line
by typing <installdir>\JASP.exe > c:\temp\JASP.log
commit 47387245b6df3ac5cb536272581d6e5d4781e0e1
Merge: 3b83ecac 8f0bd409
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 14 15:06:28 2017 +0100
Merge pull request #1675 from boutinb/development
Add resize column in data view
commit 8f0bd409ecd85c59dc74dff44faf31588c4a9dd0
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 14 14:52:02 2017 +0100
Add resize column in data view
commit c3c62c5a1811c2467d67dc3406c6ae324f084618
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Mar 13 16:33:41 2017 +0100
Style guide updated
Style guide updated
commit 74603bd375708ae89f71f2cc367167d6b5cf6203
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Mar 13 11:19:34 2017 +0100
Added call statement
- bfObject$call tells you the R code
- obsR, obsN changed to rObs and nObs
commit edd69b082b81bbed409e7bb0ec6f42f23d743f66
Merge: 31087d15 3b83ecac
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun Mar 12 10:27:12 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 0dfc145344daaada556da45a6f9d2177f061f6e6
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sat Mar 11 16:53:21 2017 +0100
Fixed the combined one-sided bfs
commit f57e13d7a0d62161f3eeddc6af92b06952f39b63
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sat Mar 11 14:20:27 2017 +0100
Added dormant replication BF for the correlation, cleaned out code
Added:
- isTryError in common
- .bfPearsonCorrelation, a wrapper around .bfCorrieKernel that loops
over the methods automatically
- Rewrote .bfCorrieKernel. The method numbers in .bfCorrieKernel now
refer to 1. exact likelihood, 2. jeffreysApprox likelihood, 3.
Savage-Dickey beta approximation to the likelihood, 4. Marsman sampler,
5. Jeffreys asymptotic approximation, 6. Error. Thus, numerical is
swapped for Savage-Dickey beta approximation
- .bfHypergeo is a wrapper for method 1 and 2. Automatically switches
from hypergeometric result to numerical integration whenever the
two-sided bf10 > 10^(hyperGeoOverFlowThreshold)
- Added .bfCorrieRepJosine, which is not activated in the UI.
.bfCorrieRepJosine takes on the role of .bfCorrieKernel for replication
(summary stats) data.
Changed (mostly style changes):
- camelCases: Changed variable.names to variableNames to adhere to the
style guide
- all.bfs to bfObject
- some.r to obsR
- .jeffreysApproxH function to . hJeffreysApprox
- changed return(NaN) to return(NA) in .bf10Exact - though I had some
semantical reasons to use NAN instead NA, but this can be solved by
identifying NULL to not calculated yet
- changed function call by name rather than position
- added name spaces to some functions calls, such
- removed base name space for is.infinite
Removed:
- Removed .bf10Numerical, it isn’t used anyways, but hard coded in
commit 3b83ecaccdf24db95e1028b5b0926c67833d8c9e
Merge: 29c332d1 484c811d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 8 13:24:36 2017 +0100
Merge pull request #1663 from TimKDJ/patch-1
Added/clarified error handling documentation
commit 29c332d1b158c35451d9bbe26f8bf8974fdf2517
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed Mar 8 13:24:16 2017 +0100
Enhancement error handling (#1664)
* Documentation for creating module added
* Fixed flashing of options window after stacktrace click
* Update make-dmg script
* Set min size for preferences dialog
* Bug fixes Reliability analysis (#1650)
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
* Ignore extracted testfiles
* Make the preferences dialog bigger
* Synchronzation with OSF Files
* Refine tooltip messages
The tooltip on the column is split into a separate tooltip for the icon
and column name
* Remove ? mark on Preferences dialog
Remove ? mark on Preferences dialog.
Appears only on Windows
* File from examples should not be editable.
* Added tests SEM module
From Sacha :
Added
HolzingerSwineford1939_covmat.jasp and MeasurementInvariance.jasp
* Fixed RM ANOVA so that factor names can be changed with correct consequences for the tests
* Change tooltip on scale column header.
* Remove optionforms relicts (#1662)
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Added support for custom checks, various improvements
commit 77c22ea47ee6c3e75871a43e6153b9a88a415985
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 8 12:14:30 2017 +0100
Small bug on sync
commit ac75916896287dd35245261cb6fed7d7c9c7de21
Merge: db7ae625 efef726c
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 7 11:36:01 2017 +0100
Merge pull request #1665 from FransMeerhoff/development
Update Mac build script
commit db7ae62501e6724b97d13b668b31c9e8f14fd0fd
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 7 11:32:27 2017 +0100
Variable Window updates
Add tooltip.
Remove vertical header.
Add background color for values
Don’t refresh analyses when label did not change
commit efef726c24d7a39cb858281ca05f34990a947da6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Mar 7 11:07:49 2017 +0100
Use parameter for Info.plist.template
Use the JASP_DESKTOP parameter to copy to proper location.
commit 484c811d8bfe5972ebb38d17def6974bc8ec2d0a
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Mon Mar 6 14:59:13 2017 +0100
Added custom explanation and some clarifications
commit bd7951c1710617ce62b037705720fd103a2d28fa
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 16:51:19 2017 +0100
Remove optionforms relicts (#1662)
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
commit 0aeb84801ee1ad0850c436f3ad1528484edc5c68
Merge: 34856706 012db9a6
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 16:44:10 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 34856706a9516bee62ebb7b2bd065b1483b9179e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 16:43:27 2017 +0100
Change tooltip on scale column header.
commit 012db9a6a4d648384251e0ba0f4665503a656219
Merge: 757a3f19 a651e44f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 15:56:58 2017 +0100
Merge pull request #1660 from JohnnyDoorn/development
Fixed RM ANOVA names for post hoc tests
commit a651e44f7589e3ac9dc042f532d5490f9fd9e63a
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Mar 1 15:51:21 2017 +0100
Fixed RM ANOVA so that factor names can be changed with correct consequences for the tests
commit 757a3f19652f53df4b1144ae7890a78e7ff1c2d6
Merge: 9f898d4a ada6f205
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 15:37:05 2017 +0100
Merge pull request #1658 from FransMeerhoff/development
Added tests SEM module
commit 7d26deec2e87300c631d61f4898f2e67e0911a8b
Author: TimKDJ <tim_jong@hotmail.com>
Date: Wed Mar 1 11:15:50 2017 +0100
Solution for the slow Bayesian init
commit ada6f205f56e6843521768611b746d429ee90942
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 09:21:59 2017 +0100
Added tests SEM module
From Sacha :
Added
HolzingerSwineford1939_covmat.jasp and MeasurementInvariance.jasp
commit 9f898d4a12de353edae37c33ef5a31d25e5ea736
Merge: ccff6603 517b1d34
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 14:28:17 2017 +0100
Merge pull request #1657 from FransMeerhoff/development
Remove ? mark on Preferences dialog
commit ccff66030fdbf810561f792b230706123883d26b
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 14:11:16 2017 +0100
File from examples should not be editable.
commit 517b1d347c97c1edede64026663ee52174e96712
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 23 16:07:33 2017 +0100
Remove ? mark on Preferences dialog
Remove ? mark on Preferences dialog.
Appears only on Windows
commit d90376dbc9fb47833fbc572fec375fbf07e664cc
Merge: 83c29dd4 6f7b5b4b
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 10:56:30 2017 +0100
Merge pull request #1654 from FransMeerhoff/development
Refine tooltip messages
commit 60a7e1942f0dd2c30258c7acb1f84d8a012dc184
Author: Sacha Epskamp <mail@sachaepskamp.com>
Date: Fri Feb 24 18:11:37 2017 +0100
SEM udpates
SEM updates: Multiple models, covariance matrix as input, measurement
invariance tests.
commit 6f7b5b4b0b27d2cb55218335f1c73cc526df9e09
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 23 11:25:17 2017 +0100
Refine tooltip messages
The tooltip on the column is split into a separate tooltip for the icon
and column name
commit 83c29dd4371c322a2959773fa4ea8ff50035dfe5
Merge: 104dd0d5 8b167140
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 15:58:29 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 104dd0d51e96aa68b2fba2eb5e8c8c333eccae5b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 15:57:52 2017 +0100
Synchronzation with OSF Files
commit 8b167140e83835fb309630e523217605c4e745ff
Merge: d6edb06b 15a3415d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:44:28 2017 +0100
Merge pull request #1651 from FransMeerhoff/development
Ignore extracted testfiles
commit d6edb06b0cbef32d611be361e1763328b2a67a90
Merge: 4233cf0c e6540fab
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:40:59 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 4233cf0ce452962de319595abe29ed9d859186d0
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:40:28 2017 +0100
Make the preferences dialog bigger
commit 15a3415d67739f6fe92f003f006674047aca2498
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 22 12:28:28 2017 +0100
Ignore extracted testfiles
commit 31087d15c0456868aea21c8d74782be2ae7cc907
Merge: 81b9b768 9feba33e
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 12:10:52 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit e6540fab0eebcb4d05dfbb6537b6268b88411d97
Merge: dc1fe7dd e08d9202
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 12:09:56 2017 +0100
Merge pull request #1645 from TimKDJ/bugfix/stacktraceWindowFlashing
Prevent window change after stacktrace click
commit dc1fe7dd66b03b93dca4fa26823d83a033c61777
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 12:08:55 2017 +0100
Bug fixes Reliability analysis (#1650)
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
commit 81b9b768cdcb30148100879e71a9829b6c2acf1a
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 10:31:01 2017 +0100
Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
commit 9feba33e85bed835af330273b6a8760185f94f75
Merge: b5f4df81 60ff447d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 09:53:41 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit b5f4df819dd81720f35bc4cc68e6e82119389d16
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 09:51:58 2017 +0100
Set min size for preferences dialog
commit 60ff447d0d45186862622ac90006f69311ed80d2
Merge: 3aebe5a1 11a20eed
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 21 09:58:55 2017 +0100
Merge pull request #1646 from akashrajkn/docs/add-module
Documentation for creating a jasp-module
commit ec42171203939872633f12f1fe5a53a748087b61
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 16:00:11 2017 +0100
a more appropriate bug fix using Tim's suggestion
commit 3ac745459c5d648b1be5904040a97f68cffdf72b
Merge: bd69b33d 3aebe5a1
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 15:43:46 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 3aebe5a10f2f6fdd750d28d722282f729e2a0bd6
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Feb 17 11:55:57 2017 +0100
Update make-dmg script
commit 11a20eed45a2b7bb42be9df19f1e200cb53e3b50
Author: akashrajkn <akashrajkn@gmail.com>
Date: Wed Feb 8 14:40:45 2017 +0100
Documentation for creating module added
commit bd69b33de89f0804fe43718a023aa7310c13a7c0
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 10:15:54 2017 +0100
clearer comment
commit 7a36c8122170f49c373dc207637fe05f23ca141d
Merge: 9cbf62a3 335c549a
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 01:06:17 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 9cbf62a385b141af00550a7799c45076b715b051
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 01:05:23 2017 +0100
bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
commit 96055e897145fa6ac70facf4f822b672c528dcad
Merge: bae9bc85 49144519
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 21:42:38 2017 +0100
Merge branch 'ReliabilityUpdates' of https://github.com/vandenman/jasp-desktop into ReliabilityUpdates
commit bae9bc85640f6db7bdab169f4acbcf607a51609e
Merge: 6cbb3c94 68f46fa3
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 21:22:01 2017 +0100
Merge remote-tracking branch 'refs/remotes/origin/development' into ReliabilityUpdates
commit e08d920292543dd8efe51685cafb239dafb6a4e8
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 17:26:01 2017 +0100
Fixed flashing of options window after stacktrace click
commit 335c549a710e78c8546715c4f153cbb55482dcca
Merge: 4d1b031c bdd841ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 16:20:55 2017 +0100
Merge pull request #1644 from TimKDJ/bugfix/errorBoxSize
Resizing of analysis box when an error is added
commit bdd841edb68ac3086ccf7e75f60f0cf220549ff6
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 16:13:46 2017 +0100
Resizing of analysis box when an error is added
commit 4d1b031c6a2e2455727ba1f0997095b419dc8b75
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 16:12:50 2017 +0100
variable window layout
commit 49144519fc146edf0f9f03389629723b273ebee0
Merge: 30b542ec 00265fcf
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 14:58:47 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 00265fcf6834e68c576c2ba7fd5d408569657527
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:49:21 2017 +0100
Crash after double-clicking when no data is loaded
commit 77d7c8b9b8d1a67288a867cac5a70c89d23869e2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:28:23 2017 +0100
Wrong label when missing value in ODS
commit 0b1910b56b963534ee2f49fa450d4dd4b7322819
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:15:35 2017 +0100
Add warning when default spreadsheet editor not found
commit 30b542ec25b805a91a2b8aa34da62299bf7470bd
Merge: 4be95fee c675a4a7
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 11:34:38 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 4be95fee9e494199751f2a20a0de69a943477052
Merge: a81e8ba0 f1fd60c2
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 11:16:25 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit c675a4a7dc63a40b9a85852d7323e05c705bc146
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 11:15:12 2017 +0100
Remove orig file from pro file
commit f1fd60c2c5176894c52021b644d4e13e170d12d0
Merge: 59653cc5 7db2b5c5
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:42:53 2017 +0100
Merge pull request #1603 from TimKDJ/Enhancement/descriptivesBayesianAnova
Descriptives Bayesian ANOVA
commit 59653cc5830578b71a2e81c01d62ec0136687bc8
Merge: 1ad201e7 75c5c4fb
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:26:05 2017 +0100
Merge pull request #1642 from TimKDJ/development
Typo, comment cleanup and stack trace bug
commit 75c5c4fb2c6743f33071fb26c3696348e54c4f05
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 10:14:49 2017 +0100
Typo, cleanup and small stack trace bug
commit 1ad201e74417e87392ba2cedd7e8a5d5c250bcf3
Merge: 0d3dde7b 7a0feace
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:03:14 2017 +0100
Merge pull request #1641 from boutinb/development
Beter handling with spss file
commit 7a0feace049b2142e1fee2695160624a20366d66
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:01:42 2017 +0100
Beter handling with spss file
commit 0d3dde7ba7d1e71e3f0a7d05f57af696310c8f19
Merge: 307f90e4 f767fa1d
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 20:50:26 2017 +0100
Merge pull request #1639 from FransMeerhoff/development
Update psych R package from 1.4.8.11 to 1.6.12
commit a81e8ba0cfebba6b2bc19b0442bb10fb717beb66
Merge: 6cbb3c94 307f90e4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 19:45:59 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit f767fa1d7d270db7efe97907be8c0c531f59f5a0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 18:14:31 2017 +0100
Update psych R package from 1.4.8.11 to 1.6.12
Update psych R package from 1.4.8.11 to 1.6.12
commit 307f90e4984271a11ec25a1d23e6051d48f653fd
Merge: 0f2893aa 82c1d13e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:54:47 2017 +0100
Merge pull request #1638 from boutinb/development
Add tooltip in table view
commit 82c1d13edb6e86226191289a181c431fc203bab3
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:54:14 2017 +0100
Add tooltip in table view
commit 68f46fa3833c2464fe89b77b83dfc26d67c352a6
Merge: b54b7d22 471bfbf4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 17:25:49 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into development
commit 0f2893aa8e27e50d6e2785376c4a988d0af08a2a
Merge: 2a5bac77 ba40399b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:21:23 2017 +0100
Merge pull request #1637 from boutinb/development
Error when filename contain #
commit ba40399b6e7b2e28975895f3463844db00522fdd
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:20:45 2017 +0100
Error when filename contain #
commit 2a5bac7745fe0a45c7ab011c91d05aa480eda75b
Merge: 471bfbf4 98d40573
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 16:51:33 2017 +0100
Merge pull request #1636 from boutinb/development
Set file name when exporting data
commit 98d40573a6b99ed538a3857f5013e7143e7b0116
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 16:50:46 2017 +0100
Set file name when exporting data
commit 471bfbf46d65713ca9c7efdbcdd802eb25790993
Merge: af12357d 277b345a
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 15:34:22 2017 +0100
Merge pull request #1635 from boutinb/development
Compile Error on odssheetcell
commit 277b345aec0c166002e0836197415301360f608b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 15:33:57 2017 +0100
Compile Error on odssheetcell
commit af12357da3ef46df4003d06e89d2a4cea784c783
Merge: 92e9dd00 26c0a289
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 14:39:20 2017 +0100
Merge pull request #1634 from boutinb/aknight1-uva-development
Aknight1 uva development
commit 6cbb3c94c24adef121756b932a980632f86338ea
Merge: 2cbfc171 92e9dd00
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 14:33:30 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 26c0a28968515afc84e57b9b2e40cd61eac27cbf
Merge: 92e9dd00 c310311b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 14:32:18 2017 +0100
ods support
commit 92e9dd00d21470b3ad0a3240192f4048b793df9b
Merge: 0e8535d7 02038a34
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:56:03 2017 +0100
Merge pull request #1633 from vankesteren/development
Add easter egg to javascript console
commit 02038a342a136b716a9e26ed8e0ba4b2d42ec46d
Author: vankesteren <erikjan.vankesteren@gmail.com>
Date: Wed Feb 15 13:53:45 2017 +0100
Add easter egg to javascript console
link to the github page
commit 0e8535d732eac9f8d4c687135495e45fc6371f3c
Merge: a15952e1 090c001f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:14:50 2017 +0100
Merge pull request #1632 from boutinb/development
preferred typo
commit 090c001f0b14afe090e7bcebdcf6c25a3283a9d8
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:13:56 2017 +0100
preferred typo
commit a15952e1e2a2922ccd899a4d162f503fbdf2a0a1
Merge: 2eda2184 b66ac3b5
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:06:11 2017 +0100
Merge pull request #1631 from FransMeerhoff/development
Change default application folder different platforms
commit 2eda2184a2060cbcc9898e3eeb434ec1d2077154
Merge: 9639f7c4 82db5523
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:04:29 2017 +0100
Merge pull request #1630 from boutinb/development
Sync dataAutoSynchronization changes with watcher
commit b66ac3b5f2ed22102bad3effe56ae09ed34ea406
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 13:03:31 2017 +0100
Change default application folder different platforms
For OSX, Windows, Linux a different application folder is selected
commit 82db55230c11c3717d729cdee7b2f0654027df97
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:02:18 2017 +0100
Sync dataAutoSynchronization changes with watcher
commit 9639f7c4f9956bad4d340d0be12bf718cd35ea7b
Merge: 305ec5cf c3c3433c
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 12:36:56 2017 +0100
Merge pull request #1629 from boutinb/development
Remove cvs association with JASP
commit c3c3433cf2be7a0526271f299dbc2566eb4ba221
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 12:36:21 2017 +0100
Remove cvs association with JASP
commit 305ec5cf1a1eda29dfa56fa7e13d463ebb9e7092
Merge: 8db18b08 e0272af0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 09:26:56 2017 +0100
Merge pull request #1628 from FransMeerhoff/update_testfiles
Add new JASP testfiles
commit e0272af0c43c7c5f24759ee0f735e84d5ae07fa7
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 23:14:01 2017 +0100
Add new JASP testfiles
Added
testFileANOVA_RM.jasp
testFileCorrelation.jasp
commit 8db18b0884a93dc674fe402c4d84345682babae4
Merge: 81418f2a c3ec3d57
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 17:49:15 2017 +0100
Merge pull request #1627 from FransMeerhoff/preferences
Add Preference Dialog
commit c3ec3d57d2495937ff0bca953807443609e07d43
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 00:32:12 2017 +0100
Add Preference Dialog
A preference dialog is added for synchronization parameters.
commit 81418f2ab4c64b8ec0ae82f9eeb4ae35c75d47d4
Merge: b66a43e1 5d332033
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 17:13:47 2017 +0100
Merge pull request #1626 from boutinb/development
Add edit feature by double-clicking the data
commit 5d3320335659fc3a6070f8669f659e38a65b5f30
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 17:12:14 2017 +0100
Add edit feature by double-clicking the data
commit b66a43e10686f31ab73aaad260ff19dee10dc117
Merge: 2be6bebd 444066f7
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 15:54:22 2017 +0100
Merge pull request #1625 from akashrajkn/bugfix
Bugfix
commit 444066f72c3930b29b169661d672a61ea4ea19d6
Author: akashrajkn <akashrajkn@gmail.com>
Date: Tue Feb 14 15:48:35 2017 +0100
remove previous error in the output
commit f1b7e2def77dac272a1fd4978269baa007ad639c
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Feb 10 13:20:11 2017 +0100
innerHTML QString bug fixed for linux build
commit 2be6bebd0a24c82c7c9d6259432b71313441d539
Merge: d79ba2a5 8183a1cb
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 12:01:45 2017 +0100
Merge pull request #1623 from FransMeerhoff/development
Bug Variables Window
commit 8183a1cbfc4cf20923f280a2548ffe8523dd5385
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 9 17:45:36 2017 +0100
Bug Variables Window
When clicking on a column not counting values JASP crashes
commit d79ba2a558740a993ac96562661c926ee2221f8e
Merge: c71c2a54 8a5a9a44
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Feb 10 16:32:00 2017 +0100
Merge pull request #1619 from AlexanderLyNL/development
Added: p-values to SumStats module
commit 8a5a9a442e244a66f23168ea88b94f613905ed73
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Feb 9 22:40:02 2017 +0100
Added namespaces to some functions
commit c71c2a5408ac2b5c61ef9ccc5f0f649f1c591576
Merge: b71029a4 fc766abe
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:23:00 2017 +0100
Merge pull request #1621 from FransMeerhoff/development
Update JASP Testfiles
commit b71029a4b5e0ac85eab02c6188a2a4428ce45af2
Merge: 68760b53 467dbeb3
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:22:41 2017 +0100
Merge pull request #1622 from boutinb/development
Add Labels from SPSS
commit 467dbeb346ee992c402a0f89cce9564c1ed8aa4f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:17:40 2017 +0100
Add Labels from SPSS
commit fc766abe2f28fbbba9beade6b67bec3af74543f2
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 8 16:52:00 2017 +0100
Update JASP Testfiles
Added :
BayesContingencyTables.jasp
BayesLogLinearRegression.jasp
FreqContingencyTables.jasp
FreqLogLinearRegression.jasp
SumStatsModule.jasp
ReliabilityAnalysis#1613.jasp
commit fb5779bf74325a02d3ab233696e03c952282845f
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Feb 8 14:53:54 2017 +0100
pValue in SumStat - Kendall's tau
Avoid SuppDists for the moment and use approximation instead.
TODO: Add SuppDists package in the library.
commit 68760b53ad6cdcb488d227bdea4b88b97d7fc7b9
Merge: b823e0bb 783a616f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 14:32:01 2017 +0100
Merge pull request #1620 from JohnnyDoorn/development
Updated post-hoc tests for repeated measures anova
commit 783a616fbceb2682d889570ea0be60cb500420da
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Feb 8 14:08:51 2017 +0100
Ancova: changed two names, so the plot sizes adjust when either width or height are adjusted.
Repeated measures: Fixed post-hoc tests issues - changed pooled error to unpooled error
Repeated measures gui: made bonferroni the default test
commit a83164ca48360108d4a1dd78499061128d4b7e18
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Feb 8 12:19:47 2017 +0100
Added: p-values to SumStats module
Added p-values to sumstats
commonsummarystatsttestbayesian
- .pValueFromT output to a list producing all three p-values at the
same time
Checked all dependencies on the repository.
- summarystatsttestbayesianindependentsamples.R
- summarystatsttestbayesianonesample.R
- summarystatsttestbayesianpairedsamples.R
Add: .pValueFromCor output a list
summarystatscorrelationbayesianpairs
Change: correlation output title for Kendall from “t” to “tau"
TODO:
- Discrepancy between cor.test method=“kendall” and the SuppDists
package
- Add SuppDists package to library
- Change plot functions for it take bfObjects
commit b823e0bba28da444c5803b4c53b787e9fdd8a3b1
Merge: 613773f8 dd82c184
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 09:38:44 2017 +0100
Merge pull request #1618 from boutinb/development
Do not warn user if sync data file does not exist.
commit dd82c18499bf5cd58878e8550490711832b694eb
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 09:38:03 2017 +0100
Do not warn user if sync data file does not exist.
commit 613773f898171880a05ec36114faceee2e26d839
Merge: 9b5e361f 86e2a54c
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 17:14:32 2017 +0100
Merge pull request #1617 from boutinb/development
Clear default options of analyses when closing file
commit 9b5e361f1400ba51d4c20b259833cc44739abe55
Merge:…
vandenman
referenced
this pull request
in vandenman/jasp-desktop
May 19, 2017
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
* Added missing value handling and Greatest lower bound
In addition: some minor code cleaning (changing `=` into `<-` ); added a
footnote warning a user that three or more variables are required for
the glb; using a try construction for the glb since it is error prone.
TODO: check why psych::alpha(d, key) can run while psych::glb(d, key)
errors for the same input.
* Fixed try-errors and added warnings in footnotes
made use of common function isTryError instead of inherits. isTryError
does not use "inherits" which could be a problem for objects with
multiple classes.
* Changed Advanced Options to autohide
modified advanced options box to have a container and modified cpp file
to hide said container.
* Fixed typo + bug fix
Fixes https://github.com/jasp-stats/jasp-desktop/issues/1761 and now
throws an error message when less than 3 valid observations are provided
(instead of breaking down).
* see previous
* improved code after review
Tim's `exitAnalysisIfErrors = TRUE` removes some code.
Alexander's Readability suggestions.
glb with reverse scaled items is still error prone.
.vdf should be read as numeric (everything should always be numeric in
the reliability).
* Squashed commit of the following:
commit 4a7c0a87157b2b27d44ae2ac4d3e46a5b1d301c0
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon May 8 13:43:19 2017 +0200
improved code after review
Tim's `exitAnalysisIfErrors = TRUE` removes some code.
Alexander's Readability suggestions.
glb with reverse scaled items is still error prone.
.vdf should be read as numeric (everything should always be numeric in
the reliability).
commit 458a63354de0aeb254ef2a9641e29febe78b1d4a
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 18:25:29 2017 +0200
see previous
commit 6ee527e1754442eb9dd674f64bbe3d181bdce9ec
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 18:25:15 2017 +0200
Fixed typo + bug fix
Fixes https://github.com/jasp-stats/jasp-desktop/issues/1761 and now
throws an error message when less than 3 valid observations are provided
(instead of breaking down).
commit 5a35d1d16d955209b1fd58e5680b84e9f2be5cef
Merge: 55d4db45 3dfcef87
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 17:46:52 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 55d4db45f901430815cc68bdf84dfdee3573def5
Merge: b5463965 cd2c7d5e
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 16:26:46 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 3dfcef87d40700d6531adcc68d3f354737e55396
Merge: b80be165 3d1c4051
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 18:25:01 2017 +0200
Merge pull request #1760 from boutinb/development
Synchronization with paired variables analyses does not refresh
commit 3d1c4051aed80852f5102adac28e87036e6f88ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 18:23:49 2017 +0200
Synchronization with paired variables analyses does not refresh
commit b80be16578ba6c75f29d36936fe2afa803ede1dc
Merge: b50c7a06 530c3fcc
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 12:00:24 2017 +0200
Merge pull request #1759 from boutinb/development
Multi level table must have beter layout
commit 530c3fcc8f24db4ef2baefe238cb41016b72eb0c
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 11:58:41 2017 +0200
Multi level table must have beter layout
commit b50c7a06f580e605f827046b323b175bc9d935af
Merge: 15670b4d 823c3c4e
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 10:56:00 2017 +0200
Merge pull request #1758 from TimKDJ/development
Bugfix printing eps
commit 823c3c4e800fd1cf35ff2d36f539b70442d87008
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Thu May 4 10:52:54 2017 +0200
Bugfix printing eps
JASP crashes if you print the state with an image in it (I will try to
find out what’s wrong exactly)
commit 15670b4d6e920d11c73abccd06e248398d0757dd
Merge: cb0732a8 7596aaa2
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 14:25:47 2017 +0200
Merge pull request #1751 from TimKDJ/upgradeR
Reapply earlier commit and add R v3.3 functionality
commit 7596aaa29a358ee53592352667b8d78af6c38573
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed May 3 14:21:00 2017 +0200
Changed variable notation
commit cb0732a88d6ee876f0307de86fc9de82a56e8f5b
Merge: 8c3de5c2 9d312c75
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 11:33:22 2017 +0200
Merge pull request #1755 from quentingronau/subjectiveBayes
SubjectiveBayes
commit 9d312c7597ffb57be699e761e262a6e54e1ba929
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Wed May 3 11:31:53 2017 +0200
minor changes to informed Bayesian t-tests
commit 8c3de5c2e80abdf17d3935a1debda8b0b0f3ac08
Merge: 06317e66 b316f2e4
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 10:43:42 2017 +0200
Merge pull request #1754 from vankesteren/fix_names
Edited the labels of VS-MPR in UI
commit b316f2e45808511793a0fce26f313f26a699f975
Author: vankesteren <erikjan.vankesteren@gmail.com>
Date: Wed May 3 10:00:09 2017 +0200
Edited the labels of VS-MPR in UI
As per request of EJ
commit 06317e666681b4b0f4c30425c9af79d7b019fe34
Merge: cd2c7d5e 7b09c790
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed May 3 09:27:39 2017 +0200
Merge pull request #1745 from AlexanderLyNL/development
(1) correlationBayesian and correlationBayesianPairs: fixed up Tim's error handling (2) regressionLogLinearBayesian: small bug fix
commit 0a6d37afb418dddb31efc5e1906056456226f25f
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 15:37:09 2017 +0200
Change UI of SubjectivePrior And fixed % error bug
commit a2edd4b5d235e7623590a3934cdf8d220aaf4f36
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 14:05:32 2017 +0200
Remove spaces in log function
commit 973bd8d3f8849f01b0cf36d2fa793faf74ef2f79
Merge: 69832ac2 cd2c7d5e
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 13:57:13 2017 +0200
Merge remote-tracking branch 'upstream/development' into subjectiveBayes
commit 7b09c7904af45fd809c89180e10c910d063338a7
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue May 2 12:37:27 2017 +0200
Added comments and fixed up state order for variable names
commit 69832ac2d19e62dfb0408ec30be788634296e615
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 11:24:05 2017 +0200
added informed t-test functionality to common
commit ac190dc06c733bb1d7bc769c2fe2738e04bdaded
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sun Apr 30 10:22:01 2017 +0200
Bayesian loglinear regression fixed
Correlations:
- added argument for failure, so call bfObject$stat make sense
Log linear Bayesian:
- NA screening using anyNA this is faster
- default and minimum models now is 2
- call in Overstall’s package should be $table$prob$Freq
- TODO: Add memory
commit cd2c7d5e1313a7cd8c6121508f53b22c255d0acc
Merge: 0eb05225 862a5ef0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 26 08:53:52 2017 +0200
Merge pull request #1748 from JohnnyDoorn/development
Fixed some minor issues in t-test
commit 0eb0522518a66557ece8943f3d15fb55e847de4b
Merge: 99468f9f 21513bb2
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Apr 25 21:19:14 2017 +0200
Merge pull request #1750 from TimKDJ/bugfix/contingencyTables
Bugfix Contingency Tables
commit 21513bb253a5ecf4b9455d02a1a2f04ddb78f4ab
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Tue Apr 25 14:49:49 2017 +0200
Bugfix package upgrade, robustness .clean
commit 862a5ef0c099d701b107198de2536a65cb5a1986
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Tue Apr 25 14:18:52 2017 +0200
fixed the wording in the t-tests
now it has proper names, hypotheses are specified correctly
removed incorrect cohen's d for one-sample t-tests
commit 682fbf8317b2c43b1d0d3e62b82efe88be7e22f6
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 16:03:06 2017 +0200
Bug fixed object naming
At the wrapper level, i.e.,
- .bfPearsonCorrelation
- .bfKendallTau
I now include the result$stat entry to uniformly have the result. It
didn’t make sense for a .bfKendallTau object to have as argument
bfObject$r. When programming for Kendall’s tau, just retain tauObs in
the code, that is, in .bfCorrieKernelKendallTau etc etc
commit 96d84b39c4b6c31cf7740ba3785f4efaef644108
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 15:04:59 2017 +0200
Fixed up Tim's error handling
Removed tracking lists to store in state (memory)
- rValuesExcludePairwise
- footnotesExcludePairwise
- footnotesExcludeListwise
Footnotes and rvalues are now stored in the object, no need to track
more things
Name change:
new: memoryExcludePairwise
old: bfValuesListExcludePairwise
new: memoryExcludeListwise
old: bfValuesListExcludeListwise
Style:
Some style stuff in regressionloglinear.R
commit 99468f9f2d4423084c07efac6b51fdb5603f3793
Merge: 5e2ffda9 72beca7e
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 15:03:49 2017 +0200
Merge pull request #1744 from TimKDJ/bugfix/bas
Bugfix development version (BAS module)
commit 72beca7e696b9dbbd82c2f0acd64a74fbf3c7ed7
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Mon Apr 24 14:16:58 2017 +0200
Removed random d
commit 938cfa7d8b16e670814b2187d8ca5f49108d880f
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Fri Apr 21 22:14:19 2017 +0200
Revert earlier commit and add R v3.3 functions
commit 5e2ffda9a9ad25fc4d6f92ac77a68dcf31bb6378
Merge: 3df268b4 5902ac10
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Apr 21 13:36:41 2017 +0200
Merge pull request #1741 from akashrajkn/BAS-development
Added BAS Regression (development version)
commit 5902ac10d949e8d510f57b114180ec73d6ce65e3
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Apr 21 16:11:04 2017 +0530
Added BAS Regression (development version)
commit 3df268b43078e5986264c979aa3f699898bca39e
Merge: 9d350d4d 4d48aa82
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 20 11:47:08 2017 +0200
Merge pull request #1740 from akashrajkn/bugfix
Added ellipses to handle parameter variablility
commit 9d350d4d0c1945e61647cd63d44e10150933bd17
Merge: dbd0d21e 2dbfb6ac
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 20 11:46:39 2017 +0200
Merge pull request #1735 from AlexanderLyNL/development
(1) credible intervals Bayesian correlation matrix and Bayesian corre…
commit 3cc33cef3a3e79b5db631ebfa38defdc6f13c8ce
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 13:00:10 2017 +0530
UI improvements to subjective priors widget
commit eacb873e4c21cc0e07d0ec28847949c59bef723d
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:59:48 2017 +0530
Added subjective priors to Bayesian TTests
1. subjectivePriors widget added to independent and paired samples ttest
2. added priors to the json file
commit 484c4c2d800467f3bf2d67e7580938fdcabc446e
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:33:04 2017 +0530
Replaced prior layout with SubjectivePriors widget in one sample ttest
commit d16dfa6242ff14f18e439a29233a385063022ca3
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:29:01 2017 +0530
Created subjective priors widget
commit 18d753c794db85baff987beb4f91a2e8b4ff2a18
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Feb 10 17:02:21 2017 +0100
Added prior options to ttest one sample
Created layout for Subjective Bayes
commit 2dbfb6ace84d274d27e8bbc333a13500396e70da
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 10:27:37 2017 +0200
Style changes and removed .Rhistory file from pull request
- Removed .Rhistory
- Style:
new: ) {
old: ){
new: if (..
old: if(..
new: else {
old: else{
commit fe05c882d0ab0da1fff78c40946abbbd227be22a
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 08:53:24 2017 +0200
Style: removed spaces LogBF10
commit f8c1fe670fb65dafbcfa929a5328cdacc2fbe7cc
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 08:33:38 2017 +0200
Style: Grammar changes
1. Removed spaces of logBF10,
2. Style change table headers in the t-tests:
- new: Statistic, old: statistic
- new: Confidence interval, old: Confidence Interval
commit 4d48aa822296e08e42e6ec3ea311b4b95d22b91f
Author: akashrajkn <akashrajkn@gmail.com>
Date: Wed Apr 19 21:43:55 2017 +0530
Added ellipses to handle parameter variablility
commit dbd0d21e864244b569b94ab45767fc3b6ad7d82e
Merge: 94eb0ab8 a44fa29c
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 19 16:39:50 2017 +0200
Merge pull request #1739 from JohnnyDoorn/kaas
Fixed Cohen's d
commit a44fa29cde3338eb89fcb716157af07774ca5005
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Apr 19 16:26:55 2017 +0200
Fixed Cohen's d
commit b5463965898d6511fca877d7404b14dd2b87e3c4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Apr 19 15:05:26 2017 +0200
Changed Advanced Options to autohide
modified advanced options box to have a container and modified cpp file
to hide said container.
commit 7c5b8ed29153cd0fb0e0eeacbec382ff55639553
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Apr 19 13:29:11 2017 +0200
some style changes
commit 94eb0ab887169798cd77e019ea5a389e749f933a
Merge: b6149a14 9db8691c
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 19 11:53:29 2017 +0200
Merge pull request #1736 from boutinb/development
Make About box selectable
commit 9db8691c86090269c2768410fa28609e96e51380
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 19 11:33:57 2017 +0200
Make About box selectable
commit 2ab7e7ce80f4995b1fd7db4ecdc602bb839d4802
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Apr 19 11:04:39 2017 +0200
(1) credible intervals Bayesian correlation matrix and Bayesian correlation pairs, (2) p-values for sumstat Kendall's tau
R changes:
- give sensible p-values and BF for Kendall’s tau when n <=2
- Only partially cleaned up correlation.R
- added isTRUE in code for robustness reason
- Removed additional layer in the bfObject when it comes to ci. Check
for ci goes via bfObject$ciValue, say, 0.95, and the intervals are in
bfObject$ci$twoSided, bfObject$ci$plusSided, bfObject$ci$minSided.
- Example: bfObject$ciValue <- 0.95 and bfObject$ci$twoSided <- c(-0.3,
-0.2, 0.1). Tells me that the 95% CI is from -0.3 to 0.1. The point
-0.2 is the median.
Style:
- reordered the input in kendall tau functions, first data, then
parameters then hyperparameters: Data: n, tauObs. Parameters: tauPop,
Hyperparameters: kappa, var=1
- .bfKendallTau is a wrapper around .bfCorrieKernelKendallTau.
Basically, it switches between various methods and various variances
- Removed double function definitions in .correlationbayesianpairs.R
- renamed functions: (1) .credibleInterval to
.computePearsonCredibleInterval
UI son and ui, cpp:
- Bayesian Correlation matrix and pairs now have button for credible
intervals <- slot is called “credibleInterval” which is true or false,
percentage is now referred to as “ciValue”
commit b6149a14bc09db08a2680e37f50221b8aab38a99
Merge: c925a5ce badb8ee4
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Apr 18 09:51:36 2017 +0200
Merge pull request #1656 from SachaEpskamp/development
SEM udpates
commit 5c1f3051813af317c84adfea34f238c0c0363168
Merge: b41a15b8 c925a5ce
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 14:00:54 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit b41a15b839368a304a65eff3b75364ab30bed80c
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 14:00:38 2017 +0200
Fixed try-errors and added warnings in footnotes
made use of common function isTryError instead of inherits. isTryError
does not use "inherits" which could be a problem for objects with
multiple classes.
commit 07fffe34ac7194a289c3ae067438c93b91ae2db9
Merge: 1c5b7b02 3883a241
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 12:36:08 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit c925a5cebd06a309b95ac3d6652a9ea575c08bce
Merge: c65e4b6f 07b2ee9f
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:21:56 2017 +0200
Merge pull request #1732 from FransMeerhoff/development
Prepare 0.8.1.2
commit c65e4b6f3dbca866f873371e4a1932aea14c9e10
Merge: 205ae4ae 7ec8ce98
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:21:04 2017 +0200
Merge pull request #1733 from boutinb/development
Make even rows more grey and keep them grey when they the table is not selected
commit 7ec8ce9818967ea877e810dfe95b4133e4af844c
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:13:41 2017 +0200
Make even rows more grey and keep them grey when they the table is not selected
commit 07b2ee9fa1ecd612ec200adb69ff3902ec3de1b6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Apr 13 15:57:37 2017 +0200
Prepare 0.8.1.2
Update version numbers
commit 205ae4ae9677851cdee941f59b971571b7169db0
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Thu Apr 13 13:58:14 2017 +0200
New pull request to add tims error handling to correlation (#1731)
* Added Tim Error Handling
Fixed issue #1677 with ANOVA table
* Added Tim Error Handling
Fixed issue #1677 with ANOVA table
* Merge branch 'development' of https://github.com/JohnnyDoorn/jasp-desktop into development
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
commit e62c15dd955f99e6b192c589c7bdae194c659610
Merge: fd051890 a91ef1a7
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 17:34:04 2017 +0200
Merge pull request #1726 from FransMeerhoff/development
ggplot2 problem
commit fd0518900d311eed56cf4c25464e0d29dce7ece1
Merge: 9025224d 17165d72
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 17:33:20 2017 +0200
Merge pull request #1730 from TimKDJ/development
Improved state retrieval
commit 17165d72f563db250ef8e0f1b981d95b4032ad82
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed Apr 12 17:29:29 2017 +0200
Improved state retrieval
commit badb8ee4a7df986a724a3aadd0063d244f439e51
Merge: 60a7e194 9025224d
Author: Sacha Epskamp <sacha.epskamp@gmail.com>
Date: Wed Apr 12 17:00:22 2017 +0200
Merge branch 'development' into development
commit a91ef1a771bf9f6f9a314cc5ff4ea9eaff5df9f1
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 12 14:28:36 2017 +0200
ggplot2 problem
Principal Component Analysis and Exploratory Factor Analysis called
ggpltot2::theme with multiple argument
commit 9025224d759e369c090f10e39a09965b13699876
Author: Erik-Jan van Kesteren <erikjan.vankesteren@gmail.com>
Date: Wed Apr 12 16:28:31 2017 +0200
Save Image As - functionality (#1727)
* Add Save Image As EPS/PNG feature
* Add Save Image As EPS/PNG feature
* SaveImage clean code step 1
* test
* Edit hack solution
* remove warning
* SaveImage edits: remove width & height in cpp
* New redrawplot function
* Read height & width + overwrite possible
Also includes a dpi conversion fix
* Clean saveImage code & implement in descriptives
* Add saveimage menu option only if convertible
* tab align small fix
* Re-perform fix boxplot error bar width
* Stricter convertible functionality js
* Add documentation to /docs/development
* Rename documentation
* update md, add convertible img to ttest
* Add parsing convenience functions & adjust
.imgToResults and .imgToState
* Update saveimg documentation
* test change don
* test change back
* start on Anova
* deleted commented code
* more commented code deleted deleted
* t-test plot convert for saveimage
* Anova is now fully functional. Note that `convertible = TRUE`
* start on Anova
* deleted commented code
* more commented code deleted deleted
* Anova is now fully functional. Note that `convertible = TRUE`
* Updated all analyses with quick fix for eps figures
in EFA and PCA: Path diagram gives an error because library magrittr is
missing. Summary stats functions error because .extractErrorMessage is
missing.
* additional changes and backwards compatability with previously done analyses
* binom test first implementation eps
* Add tiff
* Cleanup EPS implementation
State logic moved to common
* Cleanup EPS implementation
* Overwrite png possible, cleanup descriptives
* Reintroduce lost "extracterrormessage" function
* fix bug plotfunc in summarystats
* dpi fix
using png device and dev.size()
* Fix dpi scaling issue
* Fix ggplot2 backwards compatibility
commit d6d7c2791093ea185ddd76dff3374ef280b84931
Merge: 65c9c14a 68b19b4e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 16:26:18 2017 +0200
Merge pull request #1728 from boutinb/development
Better SPSS synchronisation
commit 68b19b4eb49599beca9ac1338932d0931e7edc37
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 16:06:45 2017 +0200
Better SPSS synchronisation
commit 65c9c14a208ba9a999789ca081a81f00a2e17a77
Merge: c12f9055 a49df5cc
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 13:54:09 2017 +0200
Merge pull request #1723 from FransMeerhoff/r_upgrade
Enable R 3.3
commit a49df5cc366687402cea40e0dd7c3102dea2640d
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Apr 11 19:10:45 2017 +0200
Update jasp-building-guide.md
Fixed up broken links due to spaces
commit c12f9055d80511395aaf9c0f1da72efaa4ddfa26
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Apr 11 19:10:45 2017 +0200
Update jasp-building-guide.md
Fixed up broken links due to spaces
commit d989b6e3dc81fa58a65513351d10165bd9ca769f
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Apr 6 14:32:38 2017 +0200
Enable R 3.3
commit 3883a2416c8f0621c9c52d58730c1b245b70ba36
Merge: a9209d8a 009c4b65
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 11:18:50 2017 +0200
Merge pull request #1717 from boutinb/development
Add tooltip to the Anova Model Widget to help make interactions
commit 009c4b65a1c123c46669d0df2955a9b2658c6678
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 11:04:48 2017 +0200
Add tooltip to the Anova Model Widget to help make interactions
commit a9209d8af0fa63c1113906b4e41b5c0e68798792
Merge: 5ec73983 b10a74a8
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:36:09 2017 +0200
Merge pull request #1707 from TimKDJ/bugfix/NALevel
t-test fix
commit 5ec739835848955985e0fcd5cd92a5e6306710f4
Merge: 8af04853 66dc1d5a
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:34:56 2017 +0200
Merge pull request #1709 from jasp-stats/TimKDJ-patch-2
Added state explanation
commit 8af04853aad4b2f1a99f6d74b65b8feed92a9b99
Merge: 8fe3c188 dd739671
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:34:35 2017 +0200
Merge pull request #1712 from TimKDJ/feature/BestModelTop
Compare BayesFactor output with best model
commit 8fe3c1887260f2c36af8c955db7833ef573b6007
Merge: dd87f95a 4adfaba2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:16:33 2017 +0200
Merge pull request #1716 from FransMeerhoff/r_upgrade
Add RInside code to JASP-Engine
commit 4adfaba27704b003d9962463b6a1fd448b668702
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 2 17:22:00 2017 +0100
Add RInside code to JASP-Engine
The cpp code from the RInside package is added to the JASP-Engine.pro
commit 66dc1d5a11891f7c04f4509aabbeb64b531b0c7c
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Thu Mar 30 15:38:07 2017 +0200
Added state explanation
commit b10a74a896abf0e49f56f042d5a4ac048d2171a7
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 30 13:00:47 2017 +0200
Fix to NA levels and minimum obs amount
commit dd739671e40794215b99a337e740322fc72a9b96
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 30 10:52:51 2017 +0200
Best model top
commit dd87f95a039313b4284fda8e7481e3a4ef2f5a02
Merge: 0259ccef aba7aad6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 10:28:54 2017 +0200
Merge pull request #1706 from FransMeerhoff/development
Typo issue template
commit aba7aad67fa9dc0564ed5188d7d6d6e3119a76e7
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 09:47:21 2017 +0200
Typo issue template
Typo issue template
commit 0259ccef391eca417a8e6165678dc135e93fe1e4
Merge: 0e2645fd 2973e181
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 30 09:44:10 2017 +0200
Merge pull request #1705 from FransMeerhoff/development
update issue template
commit 2973e18127f6082dde9a0c4cb9b414832428373a
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 09:37:29 2017 +0200
update issue template
Make a distinction between enhancement request and bugs
commit 1c5b7b02414f7275dfe06629f679418d0355d59f
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Mar 29 00:08:15 2017 +0200
Added missing value handling and Greatest lower bound
In addition: some minor code cleaning (changing `=` into `<-` ); added a
footnote warning a user that three or more variables are required for
the glb; using a try construction for the glb since it is error prone.
TODO: check why psych::alpha(d, key) can run while psych::glb(d, key)
errors for the same input.
commit 74b147ce9f7d747f0254d4d74d8fdbaaa88b8c6d
Merge: edd69b08 acb373f2
Author: vandenman <donvdbergh@hotmail.com>
Date: Tue Mar 28 19:48:53 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 0e2645fda85af6299911cefcdd66d5a21fcaf5b5
Merge: acb373f2 c6aaef1e
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 28 10:38:29 2017 +0200
Merge pull request #1701 from boutinb/development
About box on Mac does not work
commit c6aaef1e4dca136d0ac551fd24bcb9ca02950d23
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 28 10:32:08 2017 +0200
About box on Mac does not work
Solves #1700
commit acb373f23dccbf87c66f49beb6cdc13dbcdd426c
Merge: 794b38f8 4ee4569b
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:49:20 2017 +0100
Merge pull request #1686 from silberzwiebel/development
Added build instructions for Fedora
commit 794b38f84957a5078a69d8f4ad023b884af835fc
Merge: 04df2733 638d60c5
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:48:51 2017 +0100
Merge pull request #1688 from akashrajkn/fix/summary-stats
Fixed the BF10 bug in posterior plot
commit 04df2733894186b825a1dd6b7f518482088eaaa4
Merge: b6e11ded 88cf26ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:46:17 2017 +0100
Merge pull request #1696 from boutinb/development
Crash when open a JASP file after closing another one
commit 88cf26ed0ee086a625c2b84896f1e73a23be709a
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:44:50 2017 +0100
Change variables can crash when an analysis was deleted
commit 41b8512d1293f78dcceea4c9650b1ecd85ef4aad
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 22 10:57:11 2017 +0100
Crash when open a JASP file after closing another one
When closing, the analyses must be internally deleted.
commit b6e11deddb7a5b4fc5045fa3a0f840a44f5f1e0f
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 21 14:24:53 2017 +0100
Remove TestFiles.zip from installer in mac
commit b8bfd96dcd18cd39ef9fafa9113c12fd6d69df1f
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 21 12:12:16 2017 +0100
Set right citation for analyses
commit 638d60c51e7dcef8487ceb97289a0403f344eda1
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sun Mar 12 10:30:55 2017 +0530
Fixed the BF10 bug in posterior plot
commit 4ee4569bc25839b06d733ff41035e7e2ef8a6cb5
Merge: 00905323 9981ad9c
Author: silberzwiebel <silberzwiebel@users.noreply.github.com>
Date: Fri Mar 17 09:26:17 2017 +0100
Merge pull request #1 from silberzwiebel/silberzwiebel-patch-fedora-build
Added build instructions for Fedora
commit 9981ad9c8576478b8487dd8ae3baee1b5f04dcb2
Author: silberzwiebel <silberzwiebel@users.noreply.github.com>
Date: Fri Mar 17 09:25:24 2017 +0100
Added build instructions for Fedora
After I had some troubles some months ago (see https://github.com/jasp-stats/jasp-desktop/issues/1507 ) I wanted to look at the new release and managed to compile it under Fedora using these instructions. I thought, they might be better in a central place then only at my PC.
commit 00905323a97e1e4200d9740244e69bcef2285e93
Merge: b09e227a eb3e376d
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 17:31:07 2017 +0100
Merge pull request #1685 from TimKDJ/bugfix/levelCheck
Omit NA's from the factor level check
commit eb3e376d827aaeb1b2b573071dc00770010d4876
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 16 17:24:50 2017 +0100
Omit NA's from the factor level check
commit b09e227a5e3375770ca39d2ae5b64195c9fffd24
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 16:53:35 2017 +0100
Set Version for 0.8.1.1
commit 1951c8d4df2645a9e2f09063c6f5f47cc971b37e
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 16:49:44 2017 +0100
Fixes #1672: JASP crashes loading CSV
commit a3dc1fa83e22d947103dcb75ced20567b6bea0d0
Merge: 892647e5 343d3c34
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 16 15:56:57 2017 +0100
Merge pull request #1679 from AlexanderLyNL/patch-2
Update r-style-guide.md
commit 892647e5f3abdee5a50655a50a6caf096298b5c7
Merge: 7c2f7b9e 0288beda
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 16 13:34:28 2017 +0100
Merge pull request #1680 from AlexanderLyNL/development
Small init bug fixed
commit 7c2f7b9e6785de58a358c38ccb58d68cd8421ddc
Merge: 8ad4fb87 e3313818
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 10:04:37 2017 +0100
Merge pull request #1681 from akashrajkn/issue-template
Added ISSUE_TEMPLATE
commit e3313818c736d8da228a879316b53232a064ba54
Author: akashrajkn <akashrajkn@gmail.com>
Date: Thu Mar 16 11:12:28 2017 +0530
Added ISSUE_TEMPLATE
commit 0288beda9618c994d67db67798159d51aaa617a9
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 22:24:55 2017 +0100
Added comments to code
commit a3429f4ff7862b5a07e1bceb549ebe2842be487a
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 19:01:15 2017 +0100
Small init bug fixed
commit 343d3c34774a7c5e7103276fc0e1579cf11b0769
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 17:25:21 2017 +0100
Update r-style-guide.md
commit 8ad4fb87e731049d2dcddbd53648055c32ec39bd
Merge: 90d7b273 7d26deec
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:52:33 2017 +0100
Merge pull request #1659 from TimKDJ/bugfix/slowBayesianAnalyses
Solution for the slow Bayesian init
commit 90d7b273c371895acc9eb9b3463abcd9a8c557ca
Merge: 4a45854d 649f2ad9
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:50:11 2017 +0100
Merge pull request #1673 from AlexanderLyNL/development
Added dormant replication BF for the correlation, cleaned out code
commit 4a45854ddc848e41207ba5b4cc76bdde95b76cb3
Merge: 47387245 09319845
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:48:51 2017 +0100
Merge pull request #1676 from FransMeerhoff/development
Generate log file on Windows
commit 649f2ad982d6ca424b33d776c1f9330591a290ac
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Mar 14 22:07:02 2017 +0100
added some small remarks in the style guide
commit 093198451b0c1cd36279ade918ca93ce2aeed7a1
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Mar 14 16:35:07 2017 +0100
Generate log file on Windows
Enable giving output on windows by starting JASP from the command line
by typing <installdir>\JASP.exe > c:\temp\JASP.log
commit 47387245b6df3ac5cb536272581d6e5d4781e0e1
Merge: 3b83ecac 8f0bd409
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 14 15:06:28 2017 +0100
Merge pull request #1675 from boutinb/development
Add resize column in data view
commit 8f0bd409ecd85c59dc74dff44faf31588c4a9dd0
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 14 14:52:02 2017 +0100
Add resize column in data view
commit c3c62c5a1811c2467d67dc3406c6ae324f084618
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Mar 13 16:33:41 2017 +0100
Style guide updated
Style guide updated
commit 74603bd375708ae89f71f2cc367167d6b5cf6203
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Mar 13 11:19:34 2017 +0100
Added call statement
- bfObject$call tells you the R code
- obsR, obsN changed to rObs and nObs
commit edd69b082b81bbed409e7bb0ec6f42f23d743f66
Merge: 31087d15 3b83ecac
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun Mar 12 10:27:12 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 0dfc145344daaada556da45a6f9d2177f061f6e6
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sat Mar 11 16:53:21 2017 +0100
Fixed the combined one-sided bfs
commit f57e13d7a0d62161f3eeddc6af92b06952f39b63
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sat Mar 11 14:20:27 2017 +0100
Added dormant replication BF for the correlation, cleaned out code
Added:
- isTryError in common
- .bfPearsonCorrelation, a wrapper around .bfCorrieKernel that loops
over the methods automatically
- Rewrote .bfCorrieKernel. The method numbers in .bfCorrieKernel now
refer to 1. exact likelihood, 2. jeffreysApprox likelihood, 3.
Savage-Dickey beta approximation to the likelihood, 4. Marsman sampler,
5. Jeffreys asymptotic approximation, 6. Error. Thus, numerical is
swapped for Savage-Dickey beta approximation
- .bfHypergeo is a wrapper for method 1 and 2. Automatically switches
from hypergeometric result to numerical integration whenever the
two-sided bf10 > 10^(hyperGeoOverFlowThreshold)
- Added .bfCorrieRepJosine, which is not activated in the UI.
.bfCorrieRepJosine takes on the role of .bfCorrieKernel for replication
(summary stats) data.
Changed (mostly style changes):
- camelCases: Changed variable.names to variableNames to adhere to the
style guide
- all.bfs to bfObject
- some.r to obsR
- .jeffreysApproxH function to . hJeffreysApprox
- changed return(NaN) to return(NA) in .bf10Exact - though I had some
semantical reasons to use NAN instead NA, but this can be solved by
identifying NULL to not calculated yet
- changed function call by name rather than position
- added name spaces to some functions calls, such
- removed base name space for is.infinite
Removed:
- Removed .bf10Numerical, it isn’t used anyways, but hard coded in
commit 3b83ecaccdf24db95e1028b5b0926c67833d8c9e
Merge: 29c332d1 484c811d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 8 13:24:36 2017 +0100
Merge pull request #1663 from TimKDJ/patch-1
Added/clarified error handling documentation
commit 29c332d1b158c35451d9bbe26f8bf8974fdf2517
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed Mar 8 13:24:16 2017 +0100
Enhancement error handling (#1664)
* Documentation for creating module added
* Fixed flashing of options window after stacktrace click
* Update make-dmg script
* Set min size for preferences dialog
* Bug fixes Reliability analysis (#1650)
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
* Ignore extracted testfiles
* Make the preferences dialog bigger
* Synchronzation with OSF Files
* Refine tooltip messages
The tooltip on the column is split into a separate tooltip for the icon
and column name
* Remove ? mark on Preferences dialog
Remove ? mark on Preferences dialog.
Appears only on Windows
* File from examples should not be editable.
* Added tests SEM module
From Sacha :
Added
HolzingerSwineford1939_covmat.jasp and MeasurementInvariance.jasp
* Fixed RM ANOVA so that factor names can be changed with correct consequences for the tests
* Change tooltip on scale column header.
* Remove optionforms relicts (#1662)
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Added support for custom checks, various improvements
commit 77c22ea47ee6c3e75871a43e6153b9a88a415985
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 8 12:14:30 2017 +0100
Small bug on sync
commit ac75916896287dd35245261cb6fed7d7c9c7de21
Merge: db7ae625 efef726c
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 7 11:36:01 2017 +0100
Merge pull request #1665 from FransMeerhoff/development
Update Mac build script
commit db7ae62501e6724b97d13b668b31c9e8f14fd0fd
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 7 11:32:27 2017 +0100
Variable Window updates
Add tooltip.
Remove vertical header.
Add background color for values
Don’t refresh analyses when label did not change
commit efef726c24d7a39cb858281ca05f34990a947da6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Mar 7 11:07:49 2017 +0100
Use parameter for Info.plist.template
Use the JASP_DESKTOP parameter to copy to proper location.
commit 484c811d8bfe5972ebb38d17def6974bc8ec2d0a
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Mon Mar 6 14:59:13 2017 +0100
Added custom explanation and some clarifications
commit bd7951c1710617ce62b037705720fd103a2d28fa
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 16:51:19 2017 +0100
Remove optionforms relicts (#1662)
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
commit 0aeb84801ee1ad0850c436f3ad1528484edc5c68
Merge: 34856706 012db9a6
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 16:44:10 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 34856706a9516bee62ebb7b2bd065b1483b9179e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 16:43:27 2017 +0100
Change tooltip on scale column header.
commit 012db9a6a4d648384251e0ba0f4665503a656219
Merge: 757a3f19 a651e44f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 15:56:58 2017 +0100
Merge pull request #1660 from JohnnyDoorn/development
Fixed RM ANOVA names for post hoc tests
commit a651e44f7589e3ac9dc042f532d5490f9fd9e63a
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Mar 1 15:51:21 2017 +0100
Fixed RM ANOVA so that factor names can be changed with correct consequences for the tests
commit 757a3f19652f53df4b1144ae7890a78e7ff1c2d6
Merge: 9f898d4a ada6f205
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 15:37:05 2017 +0100
Merge pull request #1658 from FransMeerhoff/development
Added tests SEM module
commit 7d26deec2e87300c631d61f4898f2e67e0911a8b
Author: TimKDJ <tim_jong@hotmail.com>
Date: Wed Mar 1 11:15:50 2017 +0100
Solution for the slow Bayesian init
commit ada6f205f56e6843521768611b746d429ee90942
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 09:21:59 2017 +0100
Added tests SEM module
From Sacha :
Added
HolzingerSwineford1939_covmat.jasp and MeasurementInvariance.jasp
commit 9f898d4a12de353edae37c33ef5a31d25e5ea736
Merge: ccff6603 517b1d34
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 14:28:17 2017 +0100
Merge pull request #1657 from FransMeerhoff/development
Remove ? mark on Preferences dialog
commit ccff66030fdbf810561f792b230706123883d26b
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 14:11:16 2017 +0100
File from examples should not be editable.
commit 517b1d347c97c1edede64026663ee52174e96712
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 23 16:07:33 2017 +0100
Remove ? mark on Preferences dialog
Remove ? mark on Preferences dialog.
Appears only on Windows
commit d90376dbc9fb47833fbc572fec375fbf07e664cc
Merge: 83c29dd4 6f7b5b4b
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 10:56:30 2017 +0100
Merge pull request #1654 from FransMeerhoff/development
Refine tooltip messages
commit 60a7e1942f0dd2c30258c7acb1f84d8a012dc184
Author: Sacha Epskamp <mail@sachaepskamp.com>
Date: Fri Feb 24 18:11:37 2017 +0100
SEM udpates
SEM updates: Multiple models, covariance matrix as input, measurement
invariance tests.
commit 6f7b5b4b0b27d2cb55218335f1c73cc526df9e09
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 23 11:25:17 2017 +0100
Refine tooltip messages
The tooltip on the column is split into a separate tooltip for the icon
and column name
commit 83c29dd4371c322a2959773fa4ea8ff50035dfe5
Merge: 104dd0d5 8b167140
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 15:58:29 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 104dd0d51e96aa68b2fba2eb5e8c8c333eccae5b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 15:57:52 2017 +0100
Synchronzation with OSF Files
commit 8b167140e83835fb309630e523217605c4e745ff
Merge: d6edb06b 15a3415d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:44:28 2017 +0100
Merge pull request #1651 from FransMeerhoff/development
Ignore extracted testfiles
commit d6edb06b0cbef32d611be361e1763328b2a67a90
Merge: 4233cf0c e6540fab
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:40:59 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 4233cf0ce452962de319595abe29ed9d859186d0
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:40:28 2017 +0100
Make the preferences dialog bigger
commit 15a3415d67739f6fe92f003f006674047aca2498
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 22 12:28:28 2017 +0100
Ignore extracted testfiles
commit 31087d15c0456868aea21c8d74782be2ae7cc907
Merge: 81b9b768 9feba33e
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 12:10:52 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit e6540fab0eebcb4d05dfbb6537b6268b88411d97
Merge: dc1fe7dd e08d9202
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 12:09:56 2017 +0100
Merge pull request #1645 from TimKDJ/bugfix/stacktraceWindowFlashing
Prevent window change after stacktrace click
commit dc1fe7dd66b03b93dca4fa26823d83a033c61777
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 12:08:55 2017 +0100
Bug fixes Reliability analysis (#1650)
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
commit 81b9b768cdcb30148100879e71a9829b6c2acf1a
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 10:31:01 2017 +0100
Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
commit 9feba33e85bed835af330273b6a8760185f94f75
Merge: b5f4df81 60ff447d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 09:53:41 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit b5f4df819dd81720f35bc4cc68e6e82119389d16
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 09:51:58 2017 +0100
Set min size for preferences dialog
commit 60ff447d0d45186862622ac90006f69311ed80d2
Merge: 3aebe5a1 11a20eed
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 21 09:58:55 2017 +0100
Merge pull request #1646 from akashrajkn/docs/add-module
Documentation for creating a jasp-module
commit ec42171203939872633f12f1fe5a53a748087b61
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 16:00:11 2017 +0100
a more appropriate bug fix using Tim's suggestion
commit 3ac745459c5d648b1be5904040a97f68cffdf72b
Merge: bd69b33d 3aebe5a1
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 15:43:46 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 3aebe5a10f2f6fdd750d28d722282f729e2a0bd6
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Feb 17 11:55:57 2017 +0100
Update make-dmg script
commit 11a20eed45a2b7bb42be9df19f1e200cb53e3b50
Author: akashrajkn <akashrajkn@gmail.com>
Date: Wed Feb 8 14:40:45 2017 +0100
Documentation for creating module added
commit bd69b33de89f0804fe43718a023aa7310c13a7c0
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 10:15:54 2017 +0100
clearer comment
commit 7a36c8122170f49c373dc207637fe05f23ca141d
Merge: 9cbf62a3 335c549a
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 01:06:17 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 9cbf62a385b141af00550a7799c45076b715b051
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 01:05:23 2017 +0100
bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
commit 96055e897145fa6ac70facf4f822b672c528dcad
Merge: bae9bc85 49144519
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 21:42:38 2017 +0100
Merge branch 'ReliabilityUpdates' of https://github.com/vandenman/jasp-desktop into ReliabilityUpdates
commit bae9bc85640f6db7bdab169f4acbcf607a51609e
Merge: 6cbb3c94 68f46fa3
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 21:22:01 2017 +0100
Merge remote-tracking branch 'refs/remotes/origin/development' into ReliabilityUpdates
commit e08d920292543dd8efe51685cafb239dafb6a4e8
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 17:26:01 2017 +0100
Fixed flashing of options window after stacktrace click
commit 335c549a710e78c8546715c4f153cbb55482dcca
Merge: 4d1b031c bdd841ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 16:20:55 2017 +0100
Merge pull request #1644 from TimKDJ/bugfix/errorBoxSize
Resizing of analysis box when an error is added
commit bdd841edb68ac3086ccf7e75f60f0cf220549ff6
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 16:13:46 2017 +0100
Resizing of analysis box when an error is added
commit 4d1b031c6a2e2455727ba1f0997095b419dc8b75
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 16:12:50 2017 +0100
variable window layout
commit 49144519fc146edf0f9f03389629723b273ebee0
Merge: 30b542ec 00265fcf
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 14:58:47 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 00265fcf6834e68c576c2ba7fd5d408569657527
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:49:21 2017 +0100
Crash after double-clicking when no data is loaded
commit 77d7c8b9b8d1a67288a867cac5a70c89d23869e2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:28:23 2017 +0100
Wrong label when missing value in ODS
commit 0b1910b56b963534ee2f49fa450d4dd4b7322819
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:15:35 2017 +0100
Add warning when default spreadsheet editor not found
commit 30b542ec25b805a91a2b8aa34da62299bf7470bd
Merge: 4be95fee c675a4a7
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 11:34:38 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 4be95fee9e494199751f2a20a0de69a943477052
Merge: a81e8ba0 f1fd60c2
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 11:16:25 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit c675a4a7dc63a40b9a85852d7323e05c705bc146
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 11:15:12 2017 +0100
Remove orig file from pro file
commit f1fd60c2c5176894c52021b644d4e13e170d12d0
Merge: 59653cc5 7db2b5c5
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:42:53 2017 +0100
Merge pull request #1603 from TimKDJ/Enhancement/descriptivesBayesianAnova
Descriptives Bayesian ANOVA
commit 59653cc5830578b71a2e81c01d62ec0136687bc8
Merge: 1ad201e7 75c5c4fb
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:26:05 2017 +0100
Merge pull request #1642 from TimKDJ/development
Typo, comment cleanup and stack trace bug
commit 75c5c4fb2c6743f33071fb26c3696348e54c4f05
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 10:14:49 2017 +0100
Typo, cleanup and small stack trace bug
commit 1ad201e74417e87392ba2cedd7e8a5d5c250bcf3
Merge: 0d3dde7b 7a0feace
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:03:14 2017 +0100
Merge pull request #1641 from boutinb/development
Beter handling with spss file
commit 7a0feace049b2142e1fee2695160624a20366d66
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:01:42 2017 +0100
Beter handling with spss file
commit 0d3dde7ba7d1e71e3f0a7d05f57af696310c8f19
Merge: 307f90e4 f767fa1d
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 20:50:26 2017 +0100
Merge pull request #1639 from FransMeerhoff/development
Update psych R package from 1.4.8.11 to 1.6.12
commit a81e8ba0cfebba6b2bc19b0442bb10fb717beb66
Merge: 6cbb3c94 307f90e4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 19:45:59 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit f767fa1d7d270db7efe97907be8c0c531f59f5a0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 18:14:31 2017 +0100
Update psych R package from 1.4.8.11 to 1.6.12
Update psych R package from 1.4.8.11 to 1.6.12
commit 307f90e4984271a11ec25a1d23e6051d48f653fd
Merge: 0f2893aa 82c1d13e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:54:47 2017 +0100
Merge pull request #1638 from boutinb/development
Add tooltip in table view
commit 82c1d13edb6e86226191289a181c431fc203bab3
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:54:14 2017 +0100
Add tooltip in table view
commit 68f46fa3833c2464fe89b77b83dfc26d67c352a6
Merge: b54b7d22 471bfbf4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 17:25:49 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into development
commit 0f2893aa8e27e50d6e2785376c4a988d0af08a2a
Merge: 2a5bac77 ba40399b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:21:23 2017 +0100
Merge pull request #1637 from boutinb/development
Error when filename contain #
commit ba40399b6e7b2e28975895f3463844db00522fdd
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:20:45 2017 +0100
Error when filename contain #
commit 2a5bac7745fe0a45c7ab011c91d05aa480eda75b
Merge: 471bfbf4 98d40573
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 16:51:33 2017 +0100
Merge pull request #1636 from boutinb/development
Set file name when exporting data
commit 98d40573a6b99ed538a3857f5013e7143e7b0116
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 16:50:46 2017 +0100
Set file name when exporting data
commit 471bfbf46d65713ca9c7efdbcdd802eb25790993
Merge: af12357d 277b345a
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 15:34:22 2017 +0100
Merge pull request #1635 from boutinb/development
Compile Error on odssheetcell
commit 277b345aec0c166002e0836197415301360f608b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 15:33:57 2017 +0100
Compile Error on odssheetcell
commit af12357da3ef46df4003d06e89d2a4cea784c783
Merge: 92e9dd00 26c0a289
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 14:39:20 2017 +0100
Merge pull request #1634 from boutinb/aknight1-uva-development
Aknight1 uva development
commit 6cbb3c94c24adef121756b932a980632f86338ea
Merge: 2cbfc171 92e9dd00
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 14:33:30 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 26c0a28968515afc84e57b9b2e40cd61eac27cbf
Merge: 92e9dd00 c310311b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 14:32:18 2017 +0100
ods support
commit 92e9dd00d21470b3ad0a3240192f4048b793df9b
Merge: 0e8535d7 02038a34
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:56:03 2017 +0100
Merge pull request #1633 from vankesteren/development
Add easter egg to javascript console
commit 02038a342a136b716a9e26ed8e0ba4b2d42ec46d
Author: vankesteren <erikjan.vankesteren@gmail.com>
Date: Wed Feb 15 13:53:45 2017 +0100
Add easter egg to javascript console
link to the github page
commit 0e8535d732eac9f8d4c687135495e45fc6371f3c
Merge: a15952e1 090c001f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:14:50 2017 +0100
Merge pull request #1632 from boutinb/development
preferred typo
commit 090c001f0b14afe090e7bcebdcf6c25a3283a9d8
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:13:56 2017 +0100
preferred typo
commit a15952e1e2a2922ccd899a4d162f503fbdf2a0a1
Merge: 2eda2184 b66ac3b5
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:06:11 2017 +0100
Merge pull request #1631 from FransMeerhoff/development
Change default application folder different platforms
commit 2eda2184a2060cbcc9898e3eeb434ec1d2077154
Merge: 9639f7c4 82db5523
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:04:29 2017 +0100
Merge pull request #1630 from boutinb/development
Sync dataAutoSynchronization changes with watcher
commit b66ac3b5f2ed22102bad3effe56ae09ed34ea406
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 13:03:31 2017 +0100
Change default application folder different platforms
For OSX, Windows, Linux a different application folder is selected
commit 82db55230c11c3717d729cdee7b2f0654027df97
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:02:18 2017 +0100
Sync dataAutoSynchronization changes with watcher
commit 9639f7c4f9956bad4d340d0be12bf718cd35ea7b
Merge: 305ec5cf c3c3433c
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 12:36:56 2017 +0100
Merge pull request #1629 from boutinb/development
Remove cvs association with JASP
commit c3c3433cf2be7a0526271f299dbc2566eb4ba221
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 12:36:21 2017 +0100
Remove cvs association with JASP
commit 305ec5cf1a1eda29dfa56fa7e13d463ebb9e7092
Merge: 8db18b08 e0272af0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 09:26:56 2017 +0100
Merge pull request #1628 from FransMeerhoff/update_testfiles
Add new JASP testfiles
commit e0272af0c43c7c5f24759ee0f735e84d5ae07fa7
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 23:14:01 2017 +0100
Add new JASP testfiles
Added
testFileANOVA_RM.jasp
testFileCorrelation.jasp
commit 8db18b0884a93dc674fe402c4d84345682babae4
Merge: 81418f2a c3ec3d57
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 17:49:15 2017 +0100
Merge pull request #1627 from FransMeerhoff/preferences
Add Preference Dialog
commit c3ec3d57d2495937ff0bca953807443609e07d43
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 00:32:12 2017 +0100
Add Preference Dialog
A preference dialog is added for synchronization parameters.
commit 81418f2ab4c64b8ec0ae82f9eeb4ae35c75d47d4
Merge: b66a43e1 5d332033
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 17:13:47 2017 +0100
Merge pull request #1626 from boutinb/development
Add edit feature by double-clicking the data
commit 5d3320335659fc3a6070f8669f659e38a65b5f30
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 17:12:14 2017 +0100
Add edit feature by double-clicking the data
commit b66a43e10686f31ab73aaad260ff19dee10dc117
Merge: 2be6bebd 444066f7
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 15:54:22 2017 +0100
Merge pull request #1625 from akashrajkn/bugfix
Bugfix
commit 444066f72c3930b29b169661d672a61ea4ea19d6
Author: akashrajkn <akashrajkn@gmail.com>
Date: Tue Feb 14 15:48:35 2017 +0100
remove previous error in the output
commit f1b7e2def77dac272a1fd4978269baa007ad639c
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Feb 10 13:20:11 2017 +0100
innerHTML QString bug fixed for linux build
commit 2be6bebd0a24c82c7c9d6259432b71313441d539
Merge: d79ba2a5 8183a1cb
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 12:01:45 2017 +0100
Merge pull request #1623 from FransMeerhoff/development
Bug Variables Window
commit 8183a1cbfc4cf20923f280a2548ffe8523dd5385
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 9 17:45:36 2017 +0100
Bug Variables Window
When clicking on a column not counting values JASP crashes
commit d79ba2a558740a993ac96562661c926ee2221f8e
Merge: c71c2a54 8a5a9a44
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Feb 10 16:32:00 2017 +0100
Merge pull request #1619 from AlexanderLyNL/development
Added: p-values to SumStats module
commit 8a5a9a442e244a66f23168ea88b94f613905ed73
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Feb 9 22:40:02 2017 +0100
Added namespaces to some functions
commit c71c2a5408ac2b5c61ef9ccc5f0f649f1c591576
Merge: b71029a4 fc766abe
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:23:00 2017 +0100
Merge pull request #1621 from FransMeerhoff/development
Update JASP Testfiles
commit b71029a4b5e0ac85eab02c6188a2a4428ce45af2
Merge: 68760b53 467dbeb3
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:22:41 2017 +0100
Merge pull request #1622 from boutinb/development
Add Labels from SPSS
commit 467dbeb346ee992c402a0f89cce9564c1ed8aa4f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:17:40 2017 +0100
Add Labels from SPSS
commit fc766abe2f28fbbba9beade6b67bec3af74543f2
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 8 16:52:00 2017 +0100
Update JASP Testfiles
Added :
BayesContingencyTables.jasp
BayesLogLinearRegression.jasp
FreqContingencyTables.jasp
FreqLogLinearRegression.jasp
SumStatsModule.jasp
ReliabilityAnalysis#1613.jasp
commit fb5779bf74325a02d3ab233696e03c952282845f
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Feb 8 14:53:54 2017 +0100
pValue in SumStat - Kendall's tau
Avoid SuppDists for the moment and use approximation instead.
TODO: Add SuppDists package in the library.
commit 68760b53ad6cdcb488d227bdea4b88b97d7fc7b9
Merge: b823e0bb 783a616f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 14:32:01 2017 +0100
Merge pull request #1620 from JohnnyDoorn/development
Updated post-hoc tests for repeated measures anova
commit 783a616fbceb2682d889570ea0be60cb500420da
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Feb 8 14:08:51 2017 +0100
Ancova: changed two names, so the plot sizes adjust when either width or height are adjusted.
Repeated measures: Fixed post-hoc tests issues - changed pooled error to unpooled error
Repeated measures gui: made bonferroni the default test
commit a83164ca48360108d4a1dd78499061128d4b7e18
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Feb 8 12:19:47 2017 +0100
Added: p-values to SumStats module
Added p-values to sumstats
commonsummarystatsttestbayesian
- .pValueFromT output to a list producing all three p-values at the
same time
Checked all dependencies on the repository.
- summarystatsttestbayesianindependentsamples.R
- summarystatsttestbayesianonesample.R
- summarystatsttestbayesianpairedsamples.R
Add: .pValueFromCor output a list
summarystatscorrelationbayesianpairs
Change: correlation output title for Kendall from “t” to “tau"
TODO:
- Discrepancy between cor.test method=“kendall” and the SuppDists
package
- Add SuppDists package to library
- Change plot functions for it take bfObjects
commit b823e0bba28da444c5803b4c53b787e9fdd8a3b1
Merge: 613773f8 dd82c184
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 09:38:44 2017 +0100
Merge pull request #1618 from boutinb/development
Do not warn user if sync data file does not exist.
commit dd82c18499bf5cd58878e8550490711832b694eb
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 09:38:03 2017 +0100
Do not warn user if sync data file does not exist.
commit 613773f898171880a05ec36114faceee2e26d839
Merge: 9b5e361f 86e2a54c
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 17:14:32 2017 +0100
Merge pull request #1617 from boutinb/development
Clear default options of analyses when closing file
commit 9b5e361f1400ba51d4c20b259833cc44739abe55
Merge:…
vandenman
referenced
this pull request
in HelenSteingroever/jasp-desktop
Jun 2, 2017
Machinelearning
FransMeerhoff
pushed a commit
that referenced
this pull request
Aug 8, 2017
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
* Added missing value handling and Greatest lower bound
In addition: some minor code cleaning (changing `=` into `<-` ); added a
footnote warning a user that three or more variables are required for
the glb; using a try construction for the glb since it is error prone.
TODO: check why psych::alpha(d, key) can run while psych::glb(d, key)
errors for the same input.
* Fixed try-errors and added warnings in footnotes
made use of common function isTryError instead of inherits. isTryError
does not use "inherits" which could be a problem for objects with
multiple classes.
* Changed Advanced Options to autohide
modified advanced options box to have a container and modified cpp file
to hide said container.
* Fixed typo + bug fix
Fixes https://github.com/jasp-stats/jasp-desktop/issues/1761 and now
throws an error message when less than 3 valid observations are provided
(instead of breaking down).
* see previous
* improved code after review
Tim's `exitAnalysisIfErrors = TRUE` removes some code.
Alexander's Readability suggestions.
glb with reverse scaled items is still error prone.
.vdf should be read as numeric (everything should always be numeric in
the reliability).
* Squashed commit of the following:
commit 4a7c0a87157b2b27d44ae2ac4d3e46a5b1d301c0
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon May 8 13:43:19 2017 +0200
improved code after review
Tim's `exitAnalysisIfErrors = TRUE` removes some code.
Alexander's Readability suggestions.
glb with reverse scaled items is still error prone.
.vdf should be read as numeric (everything should always be numeric in
the reliability).
commit 458a63354de0aeb254ef2a9641e29febe78b1d4a
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 18:25:29 2017 +0200
see previous
commit 6ee527e1754442eb9dd674f64bbe3d181bdce9ec
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 18:25:15 2017 +0200
Fixed typo + bug fix
Fixes https://github.com/jasp-stats/jasp-desktop/issues/1761 and now
throws an error message when less than 3 valid observations are provided
(instead of breaking down).
commit 5a35d1d16d955209b1fd58e5680b84e9f2be5cef
Merge: 55d4db45 3dfcef87
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 17:46:52 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 55d4db45f901430815cc68bdf84dfdee3573def5
Merge: b5463965 cd2c7d5e
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 16:26:46 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 3dfcef87d40700d6531adcc68d3f354737e55396
Merge: b80be165 3d1c4051
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 18:25:01 2017 +0200
Merge pull request #1760 from boutinb/development
Synchronization with paired variables analyses does not refresh
commit 3d1c4051aed80852f5102adac28e87036e6f88ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 18:23:49 2017 +0200
Synchronization with paired variables analyses does not refresh
commit b80be16578ba6c75f29d36936fe2afa803ede1dc
Merge: b50c7a06 530c3fcc
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 12:00:24 2017 +0200
Merge pull request #1759 from boutinb/development
Multi level table must have beter layout
commit 530c3fcc8f24db4ef2baefe238cb41016b72eb0c
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 11:58:41 2017 +0200
Multi level table must have beter layout
commit b50c7a06f580e605f827046b323b175bc9d935af
Merge: 15670b4d 823c3c4e
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 10:56:00 2017 +0200
Merge pull request #1758 from TimKDJ/development
Bugfix printing eps
commit 823c3c4e800fd1cf35ff2d36f539b70442d87008
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Thu May 4 10:52:54 2017 +0200
Bugfix printing eps
JASP crashes if you print the state with an image in it (I will try to
find out what’s wrong exactly)
commit 15670b4d6e920d11c73abccd06e248398d0757dd
Merge: cb0732a8 7596aaa2
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 14:25:47 2017 +0200
Merge pull request #1751 from TimKDJ/upgradeR
Reapply earlier commit and add R v3.3 functionality
commit 7596aaa29a358ee53592352667b8d78af6c38573
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed May 3 14:21:00 2017 +0200
Changed variable notation
commit cb0732a88d6ee876f0307de86fc9de82a56e8f5b
Merge: 8c3de5c2 9d312c75
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 11:33:22 2017 +0200
Merge pull request #1755 from quentingronau/subjectiveBayes
SubjectiveBayes
commit 9d312c7597ffb57be699e761e262a6e54e1ba929
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Wed May 3 11:31:53 2017 +0200
minor changes to informed Bayesian t-tests
commit 8c3de5c2e80abdf17d3935a1debda8b0b0f3ac08
Merge: 06317e66 b316f2e4
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 10:43:42 2017 +0200
Merge pull request #1754 from vankesteren/fix_names
Edited the labels of VS-MPR in UI
commit b316f2e45808511793a0fce26f313f26a699f975
Author: vankesteren <erikjan.vankesteren@gmail.com>
Date: Wed May 3 10:00:09 2017 +0200
Edited the labels of VS-MPR in UI
As per request of EJ
commit 06317e666681b4b0f4c30425c9af79d7b019fe34
Merge: cd2c7d5e 7b09c790
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed May 3 09:27:39 2017 +0200
Merge pull request #1745 from AlexanderLyNL/development
(1) correlationBayesian and correlationBayesianPairs: fixed up Tim's error handling (2) regressionLogLinearBayesian: small bug fix
commit 0a6d37afb418dddb31efc5e1906056456226f25f
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 15:37:09 2017 +0200
Change UI of SubjectivePrior And fixed % error bug
commit a2edd4b5d235e7623590a3934cdf8d220aaf4f36
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 14:05:32 2017 +0200
Remove spaces in log function
commit 973bd8d3f8849f01b0cf36d2fa793faf74ef2f79
Merge: 69832ac2 cd2c7d5e
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 13:57:13 2017 +0200
Merge remote-tracking branch 'upstream/development' into subjectiveBayes
commit 7b09c7904af45fd809c89180e10c910d063338a7
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue May 2 12:37:27 2017 +0200
Added comments and fixed up state order for variable names
commit 69832ac2d19e62dfb0408ec30be788634296e615
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 11:24:05 2017 +0200
added informed t-test functionality to common
commit ac190dc06c733bb1d7bc769c2fe2738e04bdaded
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sun Apr 30 10:22:01 2017 +0200
Bayesian loglinear regression fixed
Correlations:
- added argument for failure, so call bfObject$stat make sense
Log linear Bayesian:
- NA screening using anyNA this is faster
- default and minimum models now is 2
- call in Overstall’s package should be $table$prob$Freq
- TODO: Add memory
commit cd2c7d5e1313a7cd8c6121508f53b22c255d0acc
Merge: 0eb05225 862a5ef0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 26 08:53:52 2017 +0200
Merge pull request #1748 from JohnnyDoorn/development
Fixed some minor issues in t-test
commit 0eb0522518a66557ece8943f3d15fb55e847de4b
Merge: 99468f9f 21513bb2
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Apr 25 21:19:14 2017 +0200
Merge pull request #1750 from TimKDJ/bugfix/contingencyTables
Bugfix Contingency Tables
commit 21513bb253a5ecf4b9455d02a1a2f04ddb78f4ab
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Tue Apr 25 14:49:49 2017 +0200
Bugfix package upgrade, robustness .clean
commit 862a5ef0c099d701b107198de2536a65cb5a1986
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Tue Apr 25 14:18:52 2017 +0200
fixed the wording in the t-tests
now it has proper names, hypotheses are specified correctly
removed incorrect cohen's d for one-sample t-tests
commit 682fbf8317b2c43b1d0d3e62b82efe88be7e22f6
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 16:03:06 2017 +0200
Bug fixed object naming
At the wrapper level, i.e.,
- .bfPearsonCorrelation
- .bfKendallTau
I now include the result$stat entry to uniformly have the result. It
didn’t make sense for a .bfKendallTau object to have as argument
bfObject$r. When programming for Kendall’s tau, just retain tauObs in
the code, that is, in .bfCorrieKernelKendallTau etc etc
commit 96d84b39c4b6c31cf7740ba3785f4efaef644108
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 15:04:59 2017 +0200
Fixed up Tim's error handling
Removed tracking lists to store in state (memory)
- rValuesExcludePairwise
- footnotesExcludePairwise
- footnotesExcludeListwise
Footnotes and rvalues are now stored in the object, no need to track
more things
Name change:
new: memoryExcludePairwise
old: bfValuesListExcludePairwise
new: memoryExcludeListwise
old: bfValuesListExcludeListwise
Style:
Some style stuff in regressionloglinear.R
commit 99468f9f2d4423084c07efac6b51fdb5603f3793
Merge: 5e2ffda9 72beca7e
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 15:03:49 2017 +0200
Merge pull request #1744 from TimKDJ/bugfix/bas
Bugfix development version (BAS module)
commit 72beca7e696b9dbbd82c2f0acd64a74fbf3c7ed7
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Mon Apr 24 14:16:58 2017 +0200
Removed random d
commit 938cfa7d8b16e670814b2187d8ca5f49108d880f
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Fri Apr 21 22:14:19 2017 +0200
Revert earlier commit and add R v3.3 functions
commit 5e2ffda9a9ad25fc4d6f92ac77a68dcf31bb6378
Merge: 3df268b4 5902ac10
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Apr 21 13:36:41 2017 +0200
Merge pull request #1741 from akashrajkn/BAS-development
Added BAS Regression (development version)
commit 5902ac10d949e8d510f57b114180ec73d6ce65e3
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Apr 21 16:11:04 2017 +0530
Added BAS Regression (development version)
commit 3df268b43078e5986264c979aa3f699898bca39e
Merge: 9d350d4d 4d48aa82
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 20 11:47:08 2017 +0200
Merge pull request #1740 from akashrajkn/bugfix
Added ellipses to handle parameter variablility
commit 9d350d4d0c1945e61647cd63d44e10150933bd17
Merge: dbd0d21e 2dbfb6ac
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 20 11:46:39 2017 +0200
Merge pull request #1735 from AlexanderLyNL/development
(1) credible intervals Bayesian correlation matrix and Bayesian corre…
commit 3cc33cef3a3e79b5db631ebfa38defdc6f13c8ce
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 13:00:10 2017 +0530
UI improvements to subjective priors widget
commit eacb873e4c21cc0e07d0ec28847949c59bef723d
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:59:48 2017 +0530
Added subjective priors to Bayesian TTests
1. subjectivePriors widget added to independent and paired samples ttest
2. added priors to the json file
commit 484c4c2d800467f3bf2d67e7580938fdcabc446e
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:33:04 2017 +0530
Replaced prior layout with SubjectivePriors widget in one sample ttest
commit d16dfa6242ff14f18e439a29233a385063022ca3
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:29:01 2017 +0530
Created subjective priors widget
commit 18d753c794db85baff987beb4f91a2e8b4ff2a18
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Feb 10 17:02:21 2017 +0100
Added prior options to ttest one sample
Created layout for Subjective Bayes
commit 2dbfb6ace84d274d27e8bbc333a13500396e70da
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 10:27:37 2017 +0200
Style changes and removed .Rhistory file from pull request
- Removed .Rhistory
- Style:
new: ) {
old: ){
new: if (..
old: if(..
new: else {
old: else{
commit fe05c882d0ab0da1fff78c40946abbbd227be22a
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 08:53:24 2017 +0200
Style: removed spaces LogBF10
commit f8c1fe670fb65dafbcfa929a5328cdacc2fbe7cc
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 08:33:38 2017 +0200
Style: Grammar changes
1. Removed spaces of logBF10,
2. Style change table headers in the t-tests:
- new: Statistic, old: statistic
- new: Confidence interval, old: Confidence Interval
commit 4d48aa822296e08e42e6ec3ea311b4b95d22b91f
Author: akashrajkn <akashrajkn@gmail.com>
Date: Wed Apr 19 21:43:55 2017 +0530
Added ellipses to handle parameter variablility
commit dbd0d21e864244b569b94ab45767fc3b6ad7d82e
Merge: 94eb0ab8 a44fa29c
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 19 16:39:50 2017 +0200
Merge pull request #1739 from JohnnyDoorn/kaas
Fixed Cohen's d
commit a44fa29cde3338eb89fcb716157af07774ca5005
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Apr 19 16:26:55 2017 +0200
Fixed Cohen's d
commit b5463965898d6511fca877d7404b14dd2b87e3c4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Apr 19 15:05:26 2017 +0200
Changed Advanced Options to autohide
modified advanced options box to have a container and modified cpp file
to hide said container.
commit 7c5b8ed29153cd0fb0e0eeacbec382ff55639553
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Apr 19 13:29:11 2017 +0200
some style changes
commit 94eb0ab887169798cd77e019ea5a389e749f933a
Merge: b6149a14 9db8691c
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 19 11:53:29 2017 +0200
Merge pull request #1736 from boutinb/development
Make About box selectable
commit 9db8691c86090269c2768410fa28609e96e51380
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 19 11:33:57 2017 +0200
Make About box selectable
commit 2ab7e7ce80f4995b1fd7db4ecdc602bb839d4802
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Apr 19 11:04:39 2017 +0200
(1) credible intervals Bayesian correlation matrix and Bayesian correlation pairs, (2) p-values for sumstat Kendall's tau
R changes:
- give sensible p-values and BF for Kendall’s tau when n <=2
- Only partially cleaned up correlation.R
- added isTRUE in code for robustness reason
- Removed additional layer in the bfObject when it comes to ci. Check
for ci goes via bfObject$ciValue, say, 0.95, and the intervals are in
bfObject$ci$twoSided, bfObject$ci$plusSided, bfObject$ci$minSided.
- Example: bfObject$ciValue <- 0.95 and bfObject$ci$twoSided <- c(-0.3,
-0.2, 0.1). Tells me that the 95% CI is from -0.3 to 0.1. The point
-0.2 is the median.
Style:
- reordered the input in kendall tau functions, first data, then
parameters then hyperparameters: Data: n, tauObs. Parameters: tauPop,
Hyperparameters: kappa, var=1
- .bfKendallTau is a wrapper around .bfCorrieKernelKendallTau.
Basically, it switches between various methods and various variances
- Removed double function definitions in .correlationbayesianpairs.R
- renamed functions: (1) .credibleInterval to
.computePearsonCredibleInterval
UI son and ui, cpp:
- Bayesian Correlation matrix and pairs now have button for credible
intervals <- slot is called “credibleInterval” which is true or false,
percentage is now referred to as “ciValue”
commit b6149a14bc09db08a2680e37f50221b8aab38a99
Merge: c925a5ce badb8ee4
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Apr 18 09:51:36 2017 +0200
Merge pull request #1656 from SachaEpskamp/development
SEM udpates
commit 5c1f3051813af317c84adfea34f238c0c0363168
Merge: b41a15b8 c925a5ce
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 14:00:54 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit b41a15b839368a304a65eff3b75364ab30bed80c
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 14:00:38 2017 +0200
Fixed try-errors and added warnings in footnotes
made use of common function isTryError instead of inherits. isTryError
does not use "inherits" which could be a problem for objects with
multiple classes.
commit 07fffe34ac7194a289c3ae067438c93b91ae2db9
Merge: 1c5b7b02 3883a241
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 12:36:08 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit c925a5cebd06a309b95ac3d6652a9ea575c08bce
Merge: c65e4b6f 07b2ee9f
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:21:56 2017 +0200
Merge pull request #1732 from FransMeerhoff/development
Prepare 0.8.1.2
commit c65e4b6f3dbca866f873371e4a1932aea14c9e10
Merge: 205ae4ae 7ec8ce98
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:21:04 2017 +0200
Merge pull request #1733 from boutinb/development
Make even rows more grey and keep them grey when they the table is not selected
commit 7ec8ce9818967ea877e810dfe95b4133e4af844c
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:13:41 2017 +0200
Make even rows more grey and keep them grey when they the table is not selected
commit 07b2ee9fa1ecd612ec200adb69ff3902ec3de1b6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Apr 13 15:57:37 2017 +0200
Prepare 0.8.1.2
Update version numbers
commit 205ae4ae9677851cdee941f59b971571b7169db0
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Thu Apr 13 13:58:14 2017 +0200
New pull request to add tims error handling to correlation (#1731)
* Added Tim Error Handling
Fixed issue #1677 with ANOVA table
* Added Tim Error Handling
Fixed issue #1677 with ANOVA table
* Merge branch 'development' of https://github.com/JohnnyDoorn/jasp-desktop into development
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
commit e62c15dd955f99e6b192c589c7bdae194c659610
Merge: fd051890 a91ef1a7
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 17:34:04 2017 +0200
Merge pull request #1726 from FransMeerhoff/development
ggplot2 problem
commit fd0518900d311eed56cf4c25464e0d29dce7ece1
Merge: 9025224d 17165d72
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 17:33:20 2017 +0200
Merge pull request #1730 from TimKDJ/development
Improved state retrieval
commit 17165d72f563db250ef8e0f1b981d95b4032ad82
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed Apr 12 17:29:29 2017 +0200
Improved state retrieval
commit badb8ee4a7df986a724a3aadd0063d244f439e51
Merge: 60a7e194 9025224d
Author: Sacha Epskamp <sacha.epskamp@gmail.com>
Date: Wed Apr 12 17:00:22 2017 +0200
Merge branch 'development' into development
commit a91ef1a771bf9f6f9a314cc5ff4ea9eaff5df9f1
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 12 14:28:36 2017 +0200
ggplot2 problem
Principal Component Analysis and Exploratory Factor Analysis called
ggpltot2::theme with multiple argument
commit 9025224d759e369c090f10e39a09965b13699876
Author: Erik-Jan van Kesteren <erikjan.vankesteren@gmail.com>
Date: Wed Apr 12 16:28:31 2017 +0200
Save Image As - functionality (#1727)
* Add Save Image As EPS/PNG feature
* Add Save Image As EPS/PNG feature
* SaveImage clean code step 1
* test
* Edit hack solution
* remove warning
* SaveImage edits: remove width & height in cpp
* New redrawplot function
* Read height & width + overwrite possible
Also includes a dpi conversion fix
* Clean saveImage code & implement in descriptives
* Add saveimage menu option only if convertible
* tab align small fix
* Re-perform fix boxplot error bar width
* Stricter convertible functionality js
* Add documentation to /docs/development
* Rename documentation
* update md, add convertible img to ttest
* Add parsing convenience functions & adjust
.imgToResults and .imgToState
* Update saveimg documentation
* test change don
* test change back
* start on Anova
* deleted commented code
* more commented code deleted deleted
* t-test plot convert for saveimage
* Anova is now fully functional. Note that `convertible = TRUE`
* start on Anova
* deleted commented code
* more commented code deleted deleted
* Anova is now fully functional. Note that `convertible = TRUE`
* Updated all analyses with quick fix for eps figures
in EFA and PCA: Path diagram gives an error because library magrittr is
missing. Summary stats functions error because .extractErrorMessage is
missing.
* additional changes and backwards compatability with previously done analyses
* binom test first implementation eps
* Add tiff
* Cleanup EPS implementation
State logic moved to common
* Cleanup EPS implementation
* Overwrite png possible, cleanup descriptives
* Reintroduce lost "extracterrormessage" function
* fix bug plotfunc in summarystats
* dpi fix
using png device and dev.size()
* Fix dpi scaling issue
* Fix ggplot2 backwards compatibility
commit d6d7c2791093ea185ddd76dff3374ef280b84931
Merge: 65c9c14a 68b19b4e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 16:26:18 2017 +0200
Merge pull request #1728 from boutinb/development
Better SPSS synchronisation
commit 68b19b4eb49599beca9ac1338932d0931e7edc37
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 16:06:45 2017 +0200
Better SPSS synchronisation
commit 65c9c14a208ba9a999789ca081a81f00a2e17a77
Merge: c12f9055 a49df5cc
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 13:54:09 2017 +0200
Merge pull request #1723 from FransMeerhoff/r_upgrade
Enable R 3.3
commit a49df5cc366687402cea40e0dd7c3102dea2640d
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Apr 11 19:10:45 2017 +0200
Update jasp-building-guide.md
Fixed up broken links due to spaces
commit c12f9055d80511395aaf9c0f1da72efaa4ddfa26
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Apr 11 19:10:45 2017 +0200
Update jasp-building-guide.md
Fixed up broken links due to spaces
commit d989b6e3dc81fa58a65513351d10165bd9ca769f
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Apr 6 14:32:38 2017 +0200
Enable R 3.3
commit 3883a2416c8f0621c9c52d58730c1b245b70ba36
Merge: a9209d8a 009c4b65
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 11:18:50 2017 +0200
Merge pull request #1717 from boutinb/development
Add tooltip to the Anova Model Widget to help make interactions
commit 009c4b65a1c123c46669d0df2955a9b2658c6678
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 11:04:48 2017 +0200
Add tooltip to the Anova Model Widget to help make interactions
commit a9209d8af0fa63c1113906b4e41b5c0e68798792
Merge: 5ec73983 b10a74a8
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:36:09 2017 +0200
Merge pull request #1707 from TimKDJ/bugfix/NALevel
t-test fix
commit 5ec739835848955985e0fcd5cd92a5e6306710f4
Merge: 8af04853 66dc1d5a
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:34:56 2017 +0200
Merge pull request #1709 from jasp-stats/TimKDJ-patch-2
Added state explanation
commit 8af04853aad4b2f1a99f6d74b65b8feed92a9b99
Merge: 8fe3c188 dd739671
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:34:35 2017 +0200
Merge pull request #1712 from TimKDJ/feature/BestModelTop
Compare BayesFactor output with best model
commit 8fe3c1887260f2c36af8c955db7833ef573b6007
Merge: dd87f95a 4adfaba2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:16:33 2017 +0200
Merge pull request #1716 from FransMeerhoff/r_upgrade
Add RInside code to JASP-Engine
commit 4adfaba27704b003d9962463b6a1fd448b668702
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 2 17:22:00 2017 +0100
Add RInside code to JASP-Engine
The cpp code from the RInside package is added to the JASP-Engine.pro
commit 66dc1d5a11891f7c04f4509aabbeb64b531b0c7c
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Thu Mar 30 15:38:07 2017 +0200
Added state explanation
commit b10a74a896abf0e49f56f042d5a4ac048d2171a7
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 30 13:00:47 2017 +0200
Fix to NA levels and minimum obs amount
commit dd739671e40794215b99a337e740322fc72a9b96
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 30 10:52:51 2017 +0200
Best model top
commit dd87f95a039313b4284fda8e7481e3a4ef2f5a02
Merge: 0259ccef aba7aad6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 10:28:54 2017 +0200
Merge pull request #1706 from FransMeerhoff/development
Typo issue template
commit aba7aad67fa9dc0564ed5188d7d6d6e3119a76e7
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 09:47:21 2017 +0200
Typo issue template
Typo issue template
commit 0259ccef391eca417a8e6165678dc135e93fe1e4
Merge: 0e2645fd 2973e181
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 30 09:44:10 2017 +0200
Merge pull request #1705 from FransMeerhoff/development
update issue template
commit 2973e18127f6082dde9a0c4cb9b414832428373a
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 09:37:29 2017 +0200
update issue template
Make a distinction between enhancement request and bugs
commit 1c5b7b02414f7275dfe06629f679418d0355d59f
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Mar 29 00:08:15 2017 +0200
Added missing value handling and Greatest lower bound
In addition: some minor code cleaning (changing `=` into `<-` ); added a
footnote warning a user that three or more variables are required for
the glb; using a try construction for the glb since it is error prone.
TODO: check why psych::alpha(d, key) can run while psych::glb(d, key)
errors for the same input.
commit 74b147ce9f7d747f0254d4d74d8fdbaaa88b8c6d
Merge: edd69b08 acb373f2
Author: vandenman <donvdbergh@hotmail.com>
Date: Tue Mar 28 19:48:53 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 0e2645fda85af6299911cefcdd66d5a21fcaf5b5
Merge: acb373f2 c6aaef1e
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 28 10:38:29 2017 +0200
Merge pull request #1701 from boutinb/development
About box on Mac does not work
commit c6aaef1e4dca136d0ac551fd24bcb9ca02950d23
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 28 10:32:08 2017 +0200
About box on Mac does not work
Solves #1700
commit acb373f23dccbf87c66f49beb6cdc13dbcdd426c
Merge: 794b38f8 4ee4569b
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:49:20 2017 +0100
Merge pull request #1686 from silberzwiebel/development
Added build instructions for Fedora
commit 794b38f84957a5078a69d8f4ad023b884af835fc
Merge: 04df2733 638d60c5
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:48:51 2017 +0100
Merge pull request #1688 from akashrajkn/fix/summary-stats
Fixed the BF10 bug in posterior plot
commit 04df2733894186b825a1dd6b7f518482088eaaa4
Merge: b6e11ded 88cf26ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:46:17 2017 +0100
Merge pull request #1696 from boutinb/development
Crash when open a JASP file after closing another one
commit 88cf26ed0ee086a625c2b84896f1e73a23be709a
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:44:50 2017 +0100
Change variables can crash when an analysis was deleted
commit 41b8512d1293f78dcceea4c9650b1ecd85ef4aad
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 22 10:57:11 2017 +0100
Crash when open a JASP file after closing another one
When closing, the analyses must be internally deleted.
commit b6e11deddb7a5b4fc5045fa3a0f840a44f5f1e0f
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 21 14:24:53 2017 +0100
Remove TestFiles.zip from installer in mac
commit b8bfd96dcd18cd39ef9fafa9113c12fd6d69df1f
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 21 12:12:16 2017 +0100
Set right citation for analyses
commit 638d60c51e7dcef8487ceb97289a0403f344eda1
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sun Mar 12 10:30:55 2017 +0530
Fixed the BF10 bug in posterior plot
commit 4ee4569bc25839b06d733ff41035e7e2ef8a6cb5
Merge: 00905323 9981ad9c
Author: silberzwiebel <silberzwiebel@users.noreply.github.com>
Date: Fri Mar 17 09:26:17 2017 +0100
Merge pull request #1 from silberzwiebel/silberzwiebel-patch-fedora-build
Added build instructions for Fedora
commit 9981ad9c8576478b8487dd8ae3baee1b5f04dcb2
Author: silberzwiebel <silberzwiebel@users.noreply.github.com>
Date: Fri Mar 17 09:25:24 2017 +0100
Added build instructions for Fedora
After I had some troubles some months ago (see https://github.com/jasp-stats/jasp-desktop/issues/1507 ) I wanted to look at the new release and managed to compile it under Fedora using these instructions. I thought, they might be better in a central place then only at my PC.
commit 00905323a97e1e4200d9740244e69bcef2285e93
Merge: b09e227a eb3e376d
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 17:31:07 2017 +0100
Merge pull request #1685 from TimKDJ/bugfix/levelCheck
Omit NA's from the factor level check
commit eb3e376d827aaeb1b2b573071dc00770010d4876
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 16 17:24:50 2017 +0100
Omit NA's from the factor level check
commit b09e227a5e3375770ca39d2ae5b64195c9fffd24
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 16:53:35 2017 +0100
Set Version for 0.8.1.1
commit 1951c8d4df2645a9e2f09063c6f5f47cc971b37e
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 16:49:44 2017 +0100
Fixes #1672: JASP crashes loading CSV
commit a3dc1fa83e22d947103dcb75ced20567b6bea0d0
Merge: 892647e5 343d3c34
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 16 15:56:57 2017 +0100
Merge pull request #1679 from AlexanderLyNL/patch-2
Update r-style-guide.md
commit 892647e5f3abdee5a50655a50a6caf096298b5c7
Merge: 7c2f7b9e 0288beda
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 16 13:34:28 2017 +0100
Merge pull request #1680 from AlexanderLyNL/development
Small init bug fixed
commit 7c2f7b9e6785de58a358c38ccb58d68cd8421ddc
Merge: 8ad4fb87 e3313818
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 10:04:37 2017 +0100
Merge pull request #1681 from akashrajkn/issue-template
Added ISSUE_TEMPLATE
commit e3313818c736d8da228a879316b53232a064ba54
Author: akashrajkn <akashrajkn@gmail.com>
Date: Thu Mar 16 11:12:28 2017 +0530
Added ISSUE_TEMPLATE
commit 0288beda9618c994d67db67798159d51aaa617a9
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 22:24:55 2017 +0100
Added comments to code
commit a3429f4ff7862b5a07e1bceb549ebe2842be487a
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 19:01:15 2017 +0100
Small init bug fixed
commit 343d3c34774a7c5e7103276fc0e1579cf11b0769
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 17:25:21 2017 +0100
Update r-style-guide.md
commit 8ad4fb87e731049d2dcddbd53648055c32ec39bd
Merge: 90d7b273 7d26deec
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:52:33 2017 +0100
Merge pull request #1659 from TimKDJ/bugfix/slowBayesianAnalyses
Solution for the slow Bayesian init
commit 90d7b273c371895acc9eb9b3463abcd9a8c557ca
Merge: 4a45854d 649f2ad9
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:50:11 2017 +0100
Merge pull request #1673 from AlexanderLyNL/development
Added dormant replication BF for the correlation, cleaned out code
commit 4a45854ddc848e41207ba5b4cc76bdde95b76cb3
Merge: 47387245 09319845
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:48:51 2017 +0100
Merge pull request #1676 from FransMeerhoff/development
Generate log file on Windows
commit 649f2ad982d6ca424b33d776c1f9330591a290ac
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Mar 14 22:07:02 2017 +0100
added some small remarks in the style guide
commit 093198451b0c1cd36279ade918ca93ce2aeed7a1
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Mar 14 16:35:07 2017 +0100
Generate log file on Windows
Enable giving output on windows by starting JASP from the command line
by typing <installdir>\JASP.exe > c:\temp\JASP.log
commit 47387245b6df3ac5cb536272581d6e5d4781e0e1
Merge: 3b83ecac 8f0bd409
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 14 15:06:28 2017 +0100
Merge pull request #1675 from boutinb/development
Add resize column in data view
commit 8f0bd409ecd85c59dc74dff44faf31588c4a9dd0
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 14 14:52:02 2017 +0100
Add resize column in data view
commit c3c62c5a1811c2467d67dc3406c6ae324f084618
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Mar 13 16:33:41 2017 +0100
Style guide updated
Style guide updated
commit 74603bd375708ae89f71f2cc367167d6b5cf6203
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Mar 13 11:19:34 2017 +0100
Added call statement
- bfObject$call tells you the R code
- obsR, obsN changed to rObs and nObs
commit edd69b082b81bbed409e7bb0ec6f42f23d743f66
Merge: 31087d15 3b83ecac
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun Mar 12 10:27:12 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 0dfc145344daaada556da45a6f9d2177f061f6e6
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sat Mar 11 16:53:21 2017 +0100
Fixed the combined one-sided bfs
commit f57e13d7a0d62161f3eeddc6af92b06952f39b63
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sat Mar 11 14:20:27 2017 +0100
Added dormant replication BF for the correlation, cleaned out code
Added:
- isTryError in common
- .bfPearsonCorrelation, a wrapper around .bfCorrieKernel that loops
over the methods automatically
- Rewrote .bfCorrieKernel. The method numbers in .bfCorrieKernel now
refer to 1. exact likelihood, 2. jeffreysApprox likelihood, 3.
Savage-Dickey beta approximation to the likelihood, 4. Marsman sampler,
5. Jeffreys asymptotic approximation, 6. Error. Thus, numerical is
swapped for Savage-Dickey beta approximation
- .bfHypergeo is a wrapper for method 1 and 2. Automatically switches
from hypergeometric result to numerical integration whenever the
two-sided bf10 > 10^(hyperGeoOverFlowThreshold)
- Added .bfCorrieRepJosine, which is not activated in the UI.
.bfCorrieRepJosine takes on the role of .bfCorrieKernel for replication
(summary stats) data.
Changed (mostly style changes):
- camelCases: Changed variable.names to variableNames to adhere to the
style guide
- all.bfs to bfObject
- some.r to obsR
- .jeffreysApproxH function to . hJeffreysApprox
- changed return(NaN) to return(NA) in .bf10Exact - though I had some
semantical reasons to use NAN instead NA, but this can be solved by
identifying NULL to not calculated yet
- changed function call by name rather than position
- added name spaces to some functions calls, such
- removed base name space for is.infinite
Removed:
- Removed .bf10Numerical, it isn’t used anyways, but hard coded in
commit 3b83ecaccdf24db95e1028b5b0926c67833d8c9e
Merge: 29c332d1 484c811d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 8 13:24:36 2017 +0100
Merge pull request #1663 from TimKDJ/patch-1
Added/clarified error handling documentation
commit 29c332d1b158c35451d9bbe26f8bf8974fdf2517
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed Mar 8 13:24:16 2017 +0100
Enhancement error handling (#1664)
* Documentation for creating module added
* Fixed flashing of options window after stacktrace click
* Update make-dmg script
* Set min size for preferences dialog
* Bug fixes Reliability analysis (#1650)
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
* Ignore extracted testfiles
* Make the preferences dialog bigger
* Synchronzation with OSF Files
* Refine tooltip messages
The tooltip on the column is split into a separate tooltip for the icon
and column name
* Remove ? mark on Preferences dialog
Remove ? mark on Preferences dialog.
Appears only on Windows
* File from examples should not be editable.
* Added tests SEM module
From Sacha :
Added
HolzingerSwineford1939_covmat.jasp and MeasurementInvariance.jasp
* Fixed RM ANOVA so that factor names can be changed with correct consequences for the tests
* Change tooltip on scale column header.
* Remove optionforms relicts (#1662)
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Added support for custom checks, various improvements
commit 77c22ea47ee6c3e75871a43e6153b9a88a415985
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 8 12:14:30 2017 +0100
Small bug on sync
commit ac75916896287dd35245261cb6fed7d7c9c7de21
Merge: db7ae625 efef726c
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 7 11:36:01 2017 +0100
Merge pull request #1665 from FransMeerhoff/development
Update Mac build script
commit db7ae62501e6724b97d13b668b31c9e8f14fd0fd
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 7 11:32:27 2017 +0100
Variable Window updates
Add tooltip.
Remove vertical header.
Add background color for values
Don’t refresh analyses when label did not change
commit efef726c24d7a39cb858281ca05f34990a947da6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Mar 7 11:07:49 2017 +0100
Use parameter for Info.plist.template
Use the JASP_DESKTOP parameter to copy to proper location.
commit 484c811d8bfe5972ebb38d17def6974bc8ec2d0a
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Mon Mar 6 14:59:13 2017 +0100
Added custom explanation and some clarifications
commit bd7951c1710617ce62b037705720fd103a2d28fa
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 16:51:19 2017 +0100
Remove optionforms relicts (#1662)
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
commit 0aeb84801ee1ad0850c436f3ad1528484edc5c68
Merge: 34856706 012db9a6
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 16:44:10 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 34856706a9516bee62ebb7b2bd065b1483b9179e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 16:43:27 2017 +0100
Change tooltip on scale column header.
commit 012db9a6a4d648384251e0ba0f4665503a656219
Merge: 757a3f19 a651e44f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 15:56:58 2017 +0100
Merge pull request #1660 from JohnnyDoorn/development
Fixed RM ANOVA names for post hoc tests
commit a651e44f7589e3ac9dc042f532d5490f9fd9e63a
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Mar 1 15:51:21 2017 +0100
Fixed RM ANOVA so that factor names can be changed with correct consequences for the tests
commit 757a3f19652f53df4b1144ae7890a78e7ff1c2d6
Merge: 9f898d4a ada6f205
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 15:37:05 2017 +0100
Merge pull request #1658 from FransMeerhoff/development
Added tests SEM module
commit 7d26deec2e87300c631d61f4898f2e67e0911a8b
Author: TimKDJ <tim_jong@hotmail.com>
Date: Wed Mar 1 11:15:50 2017 +0100
Solution for the slow Bayesian init
commit ada6f205f56e6843521768611b746d429ee90942
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 09:21:59 2017 +0100
Added tests SEM module
From Sacha :
Added
HolzingerSwineford1939_covmat.jasp and MeasurementInvariance.jasp
commit 9f898d4a12de353edae37c33ef5a31d25e5ea736
Merge: ccff6603 517b1d34
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 14:28:17 2017 +0100
Merge pull request #1657 from FransMeerhoff/development
Remove ? mark on Preferences dialog
commit ccff66030fdbf810561f792b230706123883d26b
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 14:11:16 2017 +0100
File from examples should not be editable.
commit 517b1d347c97c1edede64026663ee52174e96712
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 23 16:07:33 2017 +0100
Remove ? mark on Preferences dialog
Remove ? mark on Preferences dialog.
Appears only on Windows
commit d90376dbc9fb47833fbc572fec375fbf07e664cc
Merge: 83c29dd4 6f7b5b4b
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 10:56:30 2017 +0100
Merge pull request #1654 from FransMeerhoff/development
Refine tooltip messages
commit 60a7e1942f0dd2c30258c7acb1f84d8a012dc184
Author: Sacha Epskamp <mail@sachaepskamp.com>
Date: Fri Feb 24 18:11:37 2017 +0100
SEM udpates
SEM updates: Multiple models, covariance matrix as input, measurement
invariance tests.
commit 6f7b5b4b0b27d2cb55218335f1c73cc526df9e09
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 23 11:25:17 2017 +0100
Refine tooltip messages
The tooltip on the column is split into a separate tooltip for the icon
and column name
commit 83c29dd4371c322a2959773fa4ea8ff50035dfe5
Merge: 104dd0d5 8b167140
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 15:58:29 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 104dd0d51e96aa68b2fba2eb5e8c8c333eccae5b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 15:57:52 2017 +0100
Synchronzation with OSF Files
commit 8b167140e83835fb309630e523217605c4e745ff
Merge: d6edb06b 15a3415d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:44:28 2017 +0100
Merge pull request #1651 from FransMeerhoff/development
Ignore extracted testfiles
commit d6edb06b0cbef32d611be361e1763328b2a67a90
Merge: 4233cf0c e6540fab
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:40:59 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 4233cf0ce452962de319595abe29ed9d859186d0
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:40:28 2017 +0100
Make the preferences dialog bigger
commit 15a3415d67739f6fe92f003f006674047aca2498
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 22 12:28:28 2017 +0100
Ignore extracted testfiles
commit 31087d15c0456868aea21c8d74782be2ae7cc907
Merge: 81b9b768 9feba33e
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 12:10:52 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit e6540fab0eebcb4d05dfbb6537b6268b88411d97
Merge: dc1fe7dd e08d9202
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 12:09:56 2017 +0100
Merge pull request #1645 from TimKDJ/bugfix/stacktraceWindowFlashing
Prevent window change after stacktrace click
commit dc1fe7dd66b03b93dca4fa26823d83a033c61777
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 12:08:55 2017 +0100
Bug fixes Reliability analysis (#1650)
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
commit 81b9b768cdcb30148100879e71a9829b6c2acf1a
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 10:31:01 2017 +0100
Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
commit 9feba33e85bed835af330273b6a8760185f94f75
Merge: b5f4df81 60ff447d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 09:53:41 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit b5f4df819dd81720f35bc4cc68e6e82119389d16
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 09:51:58 2017 +0100
Set min size for preferences dialog
commit 60ff447d0d45186862622ac90006f69311ed80d2
Merge: 3aebe5a1 11a20eed
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 21 09:58:55 2017 +0100
Merge pull request #1646 from akashrajkn/docs/add-module
Documentation for creating a jasp-module
commit ec42171203939872633f12f1fe5a53a748087b61
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 16:00:11 2017 +0100
a more appropriate bug fix using Tim's suggestion
commit 3ac745459c5d648b1be5904040a97f68cffdf72b
Merge: bd69b33d 3aebe5a1
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 15:43:46 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 3aebe5a10f2f6fdd750d28d722282f729e2a0bd6
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Feb 17 11:55:57 2017 +0100
Update make-dmg script
commit 11a20eed45a2b7bb42be9df19f1e200cb53e3b50
Author: akashrajkn <akashrajkn@gmail.com>
Date: Wed Feb 8 14:40:45 2017 +0100
Documentation for creating module added
commit bd69b33de89f0804fe43718a023aa7310c13a7c0
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 10:15:54 2017 +0100
clearer comment
commit 7a36c8122170f49c373dc207637fe05f23ca141d
Merge: 9cbf62a3 335c549a
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 01:06:17 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 9cbf62a385b141af00550a7799c45076b715b051
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 01:05:23 2017 +0100
bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
commit 96055e897145fa6ac70facf4f822b672c528dcad
Merge: bae9bc85 49144519
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 21:42:38 2017 +0100
Merge branch 'ReliabilityUpdates' of https://github.com/vandenman/jasp-desktop into ReliabilityUpdates
commit bae9bc85640f6db7bdab169f4acbcf607a51609e
Merge: 6cbb3c94 68f46fa3
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 21:22:01 2017 +0100
Merge remote-tracking branch 'refs/remotes/origin/development' into ReliabilityUpdates
commit e08d920292543dd8efe51685cafb239dafb6a4e8
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 17:26:01 2017 +0100
Fixed flashing of options window after stacktrace click
commit 335c549a710e78c8546715c4f153cbb55482dcca
Merge: 4d1b031c bdd841ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 16:20:55 2017 +0100
Merge pull request #1644 from TimKDJ/bugfix/errorBoxSize
Resizing of analysis box when an error is added
commit bdd841edb68ac3086ccf7e75f60f0cf220549ff6
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 16:13:46 2017 +0100
Resizing of analysis box when an error is added
commit 4d1b031c6a2e2455727ba1f0997095b419dc8b75
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 16:12:50 2017 +0100
variable window layout
commit 49144519fc146edf0f9f03389629723b273ebee0
Merge: 30b542ec 00265fcf
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 14:58:47 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 00265fcf6834e68c576c2ba7fd5d408569657527
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:49:21 2017 +0100
Crash after double-clicking when no data is loaded
commit 77d7c8b9b8d1a67288a867cac5a70c89d23869e2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:28:23 2017 +0100
Wrong label when missing value in ODS
commit 0b1910b56b963534ee2f49fa450d4dd4b7322819
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:15:35 2017 +0100
Add warning when default spreadsheet editor not found
commit 30b542ec25b805a91a2b8aa34da62299bf7470bd
Merge: 4be95fee c675a4a7
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 11:34:38 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 4be95fee9e494199751f2a20a0de69a943477052
Merge: a81e8ba0 f1fd60c2
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 11:16:25 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit c675a4a7dc63a40b9a85852d7323e05c705bc146
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 11:15:12 2017 +0100
Remove orig file from pro file
commit f1fd60c2c5176894c52021b644d4e13e170d12d0
Merge: 59653cc5 7db2b5c5
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:42:53 2017 +0100
Merge pull request #1603 from TimKDJ/Enhancement/descriptivesBayesianAnova
Descriptives Bayesian ANOVA
commit 59653cc5830578b71a2e81c01d62ec0136687bc8
Merge: 1ad201e7 75c5c4fb
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:26:05 2017 +0100
Merge pull request #1642 from TimKDJ/development
Typo, comment cleanup and stack trace bug
commit 75c5c4fb2c6743f33071fb26c3696348e54c4f05
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 10:14:49 2017 +0100
Typo, cleanup and small stack trace bug
commit 1ad201e74417e87392ba2cedd7e8a5d5c250bcf3
Merge: 0d3dde7b 7a0feace
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:03:14 2017 +0100
Merge pull request #1641 from boutinb/development
Beter handling with spss file
commit 7a0feace049b2142e1fee2695160624a20366d66
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:01:42 2017 +0100
Beter handling with spss file
commit 0d3dde7ba7d1e71e3f0a7d05f57af696310c8f19
Merge: 307f90e4 f767fa1d
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 20:50:26 2017 +0100
Merge pull request #1639 from FransMeerhoff/development
Update psych R package from 1.4.8.11 to 1.6.12
commit a81e8ba0cfebba6b2bc19b0442bb10fb717beb66
Merge: 6cbb3c94 307f90e4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 19:45:59 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit f767fa1d7d270db7efe97907be8c0c531f59f5a0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 18:14:31 2017 +0100
Update psych R package from 1.4.8.11 to 1.6.12
Update psych R package from 1.4.8.11 to 1.6.12
commit 307f90e4984271a11ec25a1d23e6051d48f653fd
Merge: 0f2893aa 82c1d13e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:54:47 2017 +0100
Merge pull request #1638 from boutinb/development
Add tooltip in table view
commit 82c1d13edb6e86226191289a181c431fc203bab3
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:54:14 2017 +0100
Add tooltip in table view
commit 68f46fa3833c2464fe89b77b83dfc26d67c352a6
Merge: b54b7d22 471bfbf4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 17:25:49 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into development
commit 0f2893aa8e27e50d6e2785376c4a988d0af08a2a
Merge: 2a5bac77 ba40399b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:21:23 2017 +0100
Merge pull request #1637 from boutinb/development
Error when filename contain #
commit ba40399b6e7b2e28975895f3463844db00522fdd
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:20:45 2017 +0100
Error when filename contain #
commit 2a5bac7745fe0a45c7ab011c91d05aa480eda75b
Merge: 471bfbf4 98d40573
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 16:51:33 2017 +0100
Merge pull request #1636 from boutinb/development
Set file name when exporting data
commit 98d40573a6b99ed538a3857f5013e7143e7b0116
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 16:50:46 2017 +0100
Set file name when exporting data
commit 471bfbf46d65713ca9c7efdbcdd802eb25790993
Merge: af12357d 277b345a
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 15:34:22 2017 +0100
Merge pull request #1635 from boutinb/development
Compile Error on odssheetcell
commit 277b345aec0c166002e0836197415301360f608b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 15:33:57 2017 +0100
Compile Error on odssheetcell
commit af12357da3ef46df4003d06e89d2a4cea784c783
Merge: 92e9dd00 26c0a289
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 14:39:20 2017 +0100
Merge pull request #1634 from boutinb/aknight1-uva-development
Aknight1 uva development
commit 6cbb3c94c24adef121756b932a980632f86338ea
Merge: 2cbfc171 92e9dd00
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 14:33:30 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 26c0a28968515afc84e57b9b2e40cd61eac27cbf
Merge: 92e9dd00 c310311b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 14:32:18 2017 +0100
ods support
commit 92e9dd00d21470b3ad0a3240192f4048b793df9b
Merge: 0e8535d7 02038a34
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:56:03 2017 +0100
Merge pull request #1633 from vankesteren/development
Add easter egg to javascript console
commit 02038a342a136b716a9e26ed8e0ba4b2d42ec46d
Author: vankesteren <erikjan.vankesteren@gmail.com>
Date: Wed Feb 15 13:53:45 2017 +0100
Add easter egg to javascript console
link to the github page
commit 0e8535d732eac9f8d4c687135495e45fc6371f3c
Merge: a15952e1 090c001f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:14:50 2017 +0100
Merge pull request #1632 from boutinb/development
preferred typo
commit 090c001f0b14afe090e7bcebdcf6c25a3283a9d8
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:13:56 2017 +0100
preferred typo
commit a15952e1e2a2922ccd899a4d162f503fbdf2a0a1
Merge: 2eda2184 b66ac3b5
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:06:11 2017 +0100
Merge pull request #1631 from FransMeerhoff/development
Change default application folder different platforms
commit 2eda2184a2060cbcc9898e3eeb434ec1d2077154
Merge: 9639f7c4 82db5523
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:04:29 2017 +0100
Merge pull request #1630 from boutinb/development
Sync dataAutoSynchronization changes with watcher
commit b66ac3b5f2ed22102bad3effe56ae09ed34ea406
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 13:03:31 2017 +0100
Change default application folder different platforms
For OSX, Windows, Linux a different application folder is selected
commit 82db55230c11c3717d729cdee7b2f0654027df97
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:02:18 2017 +0100
Sync dataAutoSynchronization changes with watcher
commit 9639f7c4f9956bad4d340d0be12bf718cd35ea7b
Merge: 305ec5cf c3c3433c
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 12:36:56 2017 +0100
Merge pull request #1629 from boutinb/development
Remove cvs association with JASP
commit c3c3433cf2be7a0526271f299dbc2566eb4ba221
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 12:36:21 2017 +0100
Remove cvs association with JASP
commit 305ec5cf1a1eda29dfa56fa7e13d463ebb9e7092
Merge: 8db18b08 e0272af0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 09:26:56 2017 +0100
Merge pull request #1628 from FransMeerhoff/update_testfiles
Add new JASP testfiles
commit e0272af0c43c7c5f24759ee0f735e84d5ae07fa7
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 23:14:01 2017 +0100
Add new JASP testfiles
Added
testFileANOVA_RM.jasp
testFileCorrelation.jasp
commit 8db18b0884a93dc674fe402c4d84345682babae4
Merge: 81418f2a c3ec3d57
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 17:49:15 2017 +0100
Merge pull request #1627 from FransMeerhoff/preferences
Add Preference Dialog
commit c3ec3d57d2495937ff0bca953807443609e07d43
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 00:32:12 2017 +0100
Add Preference Dialog
A preference dialog is added for synchronization parameters.
commit 81418f2ab4c64b8ec0ae82f9eeb4ae35c75d47d4
Merge: b66a43e1 5d332033
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 17:13:47 2017 +0100
Merge pull request #1626 from boutinb/development
Add edit feature by double-clicking the data
commit 5d3320335659fc3a6070f8669f659e38a65b5f30
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 17:12:14 2017 +0100
Add edit feature by double-clicking the data
commit b66a43e10686f31ab73aaad260ff19dee10dc117
Merge: 2be6bebd 444066f7
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 15:54:22 2017 +0100
Merge pull request #1625 from akashrajkn/bugfix
Bugfix
commit 444066f72c3930b29b169661d672a61ea4ea19d6
Author: akashrajkn <akashrajkn@gmail.com>
Date: Tue Feb 14 15:48:35 2017 +0100
remove previous error in the output
commit f1b7e2def77dac272a1fd4978269baa007ad639c
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Feb 10 13:20:11 2017 +0100
innerHTML QString bug fixed for linux build
commit 2be6bebd0a24c82c7c9d6259432b71313441d539
Merge: d79ba2a5 8183a1cb
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 12:01:45 2017 +0100
Merge pull request #1623 from FransMeerhoff/development
Bug Variables Window
commit 8183a1cbfc4cf20923f280a2548ffe8523dd5385
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 9 17:45:36 2017 +0100
Bug Variables Window
When clicking on a column not counting values JASP crashes
commit d79ba2a558740a993ac96562661c926ee2221f8e
Merge: c71c2a54 8a5a9a44
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Feb 10 16:32:00 2017 +0100
Merge pull request #1619 from AlexanderLyNL/development
Added: p-values to SumStats module
commit 8a5a9a442e244a66f23168ea88b94f613905ed73
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Feb 9 22:40:02 2017 +0100
Added namespaces to some functions
commit c71c2a5408ac2b5c61ef9ccc5f0f649f1c591576
Merge: b71029a4 fc766abe
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:23:00 2017 +0100
Merge pull request #1621 from FransMeerhoff/development
Update JASP Testfiles
commit b71029a4b5e0ac85eab02c6188a2a4428ce45af2
Merge: 68760b53 467dbeb3
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:22:41 2017 +0100
Merge pull request #1622 from boutinb/development
Add Labels from SPSS
commit 467dbeb346ee992c402a0f89cce9564c1ed8aa4f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:17:40 2017 +0100
Add Labels from SPSS
commit fc766abe2f28fbbba9beade6b67bec3af74543f2
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 8 16:52:00 2017 +0100
Update JASP Testfiles
Added :
BayesContingencyTables.jasp
BayesLogLinearRegression.jasp
FreqContingencyTables.jasp
FreqLogLinearRegression.jasp
SumStatsModule.jasp
ReliabilityAnalysis#1613.jasp
commit fb5779bf74325a02d3ab233696e03c952282845f
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Feb 8 14:53:54 2017 +0100
pValue in SumStat - Kendall's tau
Avoid SuppDists for the moment and use approximation instead.
TODO: Add SuppDists package in the library.
commit 68760b53ad6cdcb488d227bdea4b88b97d7fc7b9
Merge: b823e0bb 783a616f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 14:32:01 2017 +0100
Merge pull request #1620 from JohnnyDoorn/development
Updated post-hoc tests for repeated measures anova
commit 783a616fbceb2682d889570ea0be60cb500420da
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Feb 8 14:08:51 2017 +0100
Ancova: changed two names, so the plot sizes adjust when either width or height are adjusted.
Repeated measures: Fixed post-hoc tests issues - changed pooled error to unpooled error
Repeated measures gui: made bonferroni the default test
commit a83164ca48360108d4a1dd78499061128d4b7e18
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Feb 8 12:19:47 2017 +0100
Added: p-values to SumStats module
Added p-values to sumstats
commonsummarystatsttestbayesian
- .pValueFromT output to a list producing all three p-values at the
same time
Checked all dependencies on the repository.
- summarystatsttestbayesianindependentsamples.R
- summarystatsttestbayesianonesample.R
- summarystatsttestbayesianpairedsamples.R
Add: .pValueFromCor output a list
summarystatscorrelationbayesianpairs
Change: correlation output title for Kendall from “t” to “tau"
TODO:
- Discrepancy between cor.test method=“kendall” and the SuppDists
package
- Add SuppDists package to library
- Change plot functions for it take bfObjects
commit b823e0bba28da444c5803b4c53b787e9fdd8a3b1
Merge: 613773f8 dd82c184
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 09:38:44 2017 +0100
Merge pull request #1618 from boutinb/development
Do not warn user if sync data file does not exist.
commit dd82c18499bf5cd58878e8550490711832b694eb
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 09:38:03 2017 +0100
Do not warn user if sync data file does not exist.
commit 613773f898171880a05ec36114faceee2e26d839
Merge: 9b5e361f 86e2a54c
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 17:14:32 2017 +0100
Merge pull request #1617 from boutinb/development
Clear default options of analyses when closing file
commit 9b5e361f1400ba51d4c20b259833cc44739abe55
Merge:…
FransMeerhoff
pushed a commit
that referenced
this pull request
Aug 17, 2017
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
* Added missing value handling and Greatest lower bound
In addition: some minor code cleaning (changing `=` into `<-` ); added a
footnote warning a user that three or more variables are required for
the glb; using a try construction for the glb since it is error prone.
TODO: check why psych::alpha(d, key) can run while psych::glb(d, key)
errors for the same input.
* Fixed try-errors and added warnings in footnotes
made use of common function isTryError instead of inherits. isTryError
does not use "inherits" which could be a problem for objects with
multiple classes.
* Changed Advanced Options to autohide
modified advanced options box to have a container and modified cpp file
to hide said container.
* Fixed typo + bug fix
Fixes https://github.com/jasp-stats/jasp-desktop/issues/1761 and now
throws an error message when less than 3 valid observations are provided
(instead of breaking down).
* see previous
* improved code after review
Tim's `exitAnalysisIfErrors = TRUE` removes some code.
Alexander's Readability suggestions.
glb with reverse scaled items is still error prone.
.vdf should be read as numeric (everything should always be numeric in
the reliability).
* Squashed commit of the following:
commit 4a7c0a87157b2b27d44ae2ac4d3e46a5b1d301c0
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon May 8 13:43:19 2017 +0200
improved code after review
Tim's `exitAnalysisIfErrors = TRUE` removes some code.
Alexander's Readability suggestions.
glb with reverse scaled items is still error prone.
.vdf should be read as numeric (everything should always be numeric in
the reliability).
commit 458a63354de0aeb254ef2a9641e29febe78b1d4a
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 18:25:29 2017 +0200
see previous
commit 6ee527e1754442eb9dd674f64bbe3d181bdce9ec
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 18:25:15 2017 +0200
Fixed typo + bug fix
Fixes https://github.com/jasp-stats/jasp-desktop/issues/1761 and now
throws an error message when less than 3 valid observations are provided
(instead of breaking down).
commit 5a35d1d16d955209b1fd58e5680b84e9f2be5cef
Merge: 55d4db45 3dfcef87
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 17:46:52 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 55d4db45f901430815cc68bdf84dfdee3573def5
Merge: b5463965 cd2c7d5e
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun May 7 16:26:46 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 3dfcef87d40700d6531adcc68d3f354737e55396
Merge: b80be165 3d1c4051
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 18:25:01 2017 +0200
Merge pull request #1760 from boutinb/development
Synchronization with paired variables analyses does not refresh
commit 3d1c4051aed80852f5102adac28e87036e6f88ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 18:23:49 2017 +0200
Synchronization with paired variables analyses does not refresh
commit b80be16578ba6c75f29d36936fe2afa803ede1dc
Merge: b50c7a06 530c3fcc
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 12:00:24 2017 +0200
Merge pull request #1759 from boutinb/development
Multi level table must have beter layout
commit 530c3fcc8f24db4ef2baefe238cb41016b72eb0c
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 11:58:41 2017 +0200
Multi level table must have beter layout
commit b50c7a06f580e605f827046b323b175bc9d935af
Merge: 15670b4d 823c3c4e
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu May 4 10:56:00 2017 +0200
Merge pull request #1758 from TimKDJ/development
Bugfix printing eps
commit 823c3c4e800fd1cf35ff2d36f539b70442d87008
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Thu May 4 10:52:54 2017 +0200
Bugfix printing eps
JASP crashes if you print the state with an image in it (I will try to
find out what’s wrong exactly)
commit 15670b4d6e920d11c73abccd06e248398d0757dd
Merge: cb0732a8 7596aaa2
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 14:25:47 2017 +0200
Merge pull request #1751 from TimKDJ/upgradeR
Reapply earlier commit and add R v3.3 functionality
commit 7596aaa29a358ee53592352667b8d78af6c38573
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed May 3 14:21:00 2017 +0200
Changed variable notation
commit cb0732a88d6ee876f0307de86fc9de82a56e8f5b
Merge: 8c3de5c2 9d312c75
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 11:33:22 2017 +0200
Merge pull request #1755 from quentingronau/subjectiveBayes
SubjectiveBayes
commit 9d312c7597ffb57be699e761e262a6e54e1ba929
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Wed May 3 11:31:53 2017 +0200
minor changes to informed Bayesian t-tests
commit 8c3de5c2e80abdf17d3935a1debda8b0b0f3ac08
Merge: 06317e66 b316f2e4
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed May 3 10:43:42 2017 +0200
Merge pull request #1754 from vankesteren/fix_names
Edited the labels of VS-MPR in UI
commit b316f2e45808511793a0fce26f313f26a699f975
Author: vankesteren <erikjan.vankesteren@gmail.com>
Date: Wed May 3 10:00:09 2017 +0200
Edited the labels of VS-MPR in UI
As per request of EJ
commit 06317e666681b4b0f4c30425c9af79d7b019fe34
Merge: cd2c7d5e 7b09c790
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed May 3 09:27:39 2017 +0200
Merge pull request #1745 from AlexanderLyNL/development
(1) correlationBayesian and correlationBayesianPairs: fixed up Tim's error handling (2) regressionLogLinearBayesian: small bug fix
commit 0a6d37afb418dddb31efc5e1906056456226f25f
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 15:37:09 2017 +0200
Change UI of SubjectivePrior And fixed % error bug
commit a2edd4b5d235e7623590a3934cdf8d220aaf4f36
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 14:05:32 2017 +0200
Remove spaces in log function
commit 973bd8d3f8849f01b0cf36d2fa793faf74ef2f79
Merge: 69832ac2 cd2c7d5e
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 13:57:13 2017 +0200
Merge remote-tracking branch 'upstream/development' into subjectiveBayes
commit 7b09c7904af45fd809c89180e10c910d063338a7
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue May 2 12:37:27 2017 +0200
Added comments and fixed up state order for variable names
commit 69832ac2d19e62dfb0408ec30be788634296e615
Author: quentingronau <quentin.f.gronau@gmail.com>
Date: Tue May 2 11:24:05 2017 +0200
added informed t-test functionality to common
commit ac190dc06c733bb1d7bc769c2fe2738e04bdaded
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sun Apr 30 10:22:01 2017 +0200
Bayesian loglinear regression fixed
Correlations:
- added argument for failure, so call bfObject$stat make sense
Log linear Bayesian:
- NA screening using anyNA this is faster
- default and minimum models now is 2
- call in Overstall’s package should be $table$prob$Freq
- TODO: Add memory
commit cd2c7d5e1313a7cd8c6121508f53b22c255d0acc
Merge: 0eb05225 862a5ef0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 26 08:53:52 2017 +0200
Merge pull request #1748 from JohnnyDoorn/development
Fixed some minor issues in t-test
commit 0eb0522518a66557ece8943f3d15fb55e847de4b
Merge: 99468f9f 21513bb2
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Apr 25 21:19:14 2017 +0200
Merge pull request #1750 from TimKDJ/bugfix/contingencyTables
Bugfix Contingency Tables
commit 21513bb253a5ecf4b9455d02a1a2f04ddb78f4ab
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Tue Apr 25 14:49:49 2017 +0200
Bugfix package upgrade, robustness .clean
commit 862a5ef0c099d701b107198de2536a65cb5a1986
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Tue Apr 25 14:18:52 2017 +0200
fixed the wording in the t-tests
now it has proper names, hypotheses are specified correctly
removed incorrect cohen's d for one-sample t-tests
commit 682fbf8317b2c43b1d0d3e62b82efe88be7e22f6
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 16:03:06 2017 +0200
Bug fixed object naming
At the wrapper level, i.e.,
- .bfPearsonCorrelation
- .bfKendallTau
I now include the result$stat entry to uniformly have the result. It
didn’t make sense for a .bfKendallTau object to have as argument
bfObject$r. When programming for Kendall’s tau, just retain tauObs in
the code, that is, in .bfCorrieKernelKendallTau etc etc
commit 96d84b39c4b6c31cf7740ba3785f4efaef644108
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 15:04:59 2017 +0200
Fixed up Tim's error handling
Removed tracking lists to store in state (memory)
- rValuesExcludePairwise
- footnotesExcludePairwise
- footnotesExcludeListwise
Footnotes and rvalues are now stored in the object, no need to track
more things
Name change:
new: memoryExcludePairwise
old: bfValuesListExcludePairwise
new: memoryExcludeListwise
old: bfValuesListExcludeListwise
Style:
Some style stuff in regressionloglinear.R
commit 99468f9f2d4423084c07efac6b51fdb5603f3793
Merge: 5e2ffda9 72beca7e
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Apr 24 15:03:49 2017 +0200
Merge pull request #1744 from TimKDJ/bugfix/bas
Bugfix development version (BAS module)
commit 72beca7e696b9dbbd82c2f0acd64a74fbf3c7ed7
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Mon Apr 24 14:16:58 2017 +0200
Removed random d
commit 938cfa7d8b16e670814b2187d8ca5f49108d880f
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Fri Apr 21 22:14:19 2017 +0200
Revert earlier commit and add R v3.3 functions
commit 5e2ffda9a9ad25fc4d6f92ac77a68dcf31bb6378
Merge: 3df268b4 5902ac10
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Apr 21 13:36:41 2017 +0200
Merge pull request #1741 from akashrajkn/BAS-development
Added BAS Regression (development version)
commit 5902ac10d949e8d510f57b114180ec73d6ce65e3
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Apr 21 16:11:04 2017 +0530
Added BAS Regression (development version)
commit 3df268b43078e5986264c979aa3f699898bca39e
Merge: 9d350d4d 4d48aa82
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 20 11:47:08 2017 +0200
Merge pull request #1740 from akashrajkn/bugfix
Added ellipses to handle parameter variablility
commit 9d350d4d0c1945e61647cd63d44e10150933bd17
Merge: dbd0d21e 2dbfb6ac
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 20 11:46:39 2017 +0200
Merge pull request #1735 from AlexanderLyNL/development
(1) credible intervals Bayesian correlation matrix and Bayesian corre…
commit 3cc33cef3a3e79b5db631ebfa38defdc6f13c8ce
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 13:00:10 2017 +0530
UI improvements to subjective priors widget
commit eacb873e4c21cc0e07d0ec28847949c59bef723d
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:59:48 2017 +0530
Added subjective priors to Bayesian TTests
1. subjectivePriors widget added to independent and paired samples ttest
2. added priors to the json file
commit 484c4c2d800467f3bf2d67e7580938fdcabc446e
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:33:04 2017 +0530
Replaced prior layout with SubjectivePriors widget in one sample ttest
commit d16dfa6242ff14f18e439a29233a385063022ca3
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sat Mar 18 12:29:01 2017 +0530
Created subjective priors widget
commit 18d753c794db85baff987beb4f91a2e8b4ff2a18
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Feb 10 17:02:21 2017 +0100
Added prior options to ttest one sample
Created layout for Subjective Bayes
commit 2dbfb6ace84d274d27e8bbc333a13500396e70da
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 10:27:37 2017 +0200
Style changes and removed .Rhistory file from pull request
- Removed .Rhistory
- Style:
new: ) {
old: ){
new: if (..
old: if(..
new: else {
old: else{
commit fe05c882d0ab0da1fff78c40946abbbd227be22a
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 08:53:24 2017 +0200
Style: removed spaces LogBF10
commit f8c1fe670fb65dafbcfa929a5328cdacc2fbe7cc
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Apr 20 08:33:38 2017 +0200
Style: Grammar changes
1. Removed spaces of logBF10,
2. Style change table headers in the t-tests:
- new: Statistic, old: statistic
- new: Confidence interval, old: Confidence Interval
commit 4d48aa822296e08e42e6ec3ea311b4b95d22b91f
Author: akashrajkn <akashrajkn@gmail.com>
Date: Wed Apr 19 21:43:55 2017 +0530
Added ellipses to handle parameter variablility
commit dbd0d21e864244b569b94ab45767fc3b6ad7d82e
Merge: 94eb0ab8 a44fa29c
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 19 16:39:50 2017 +0200
Merge pull request #1739 from JohnnyDoorn/kaas
Fixed Cohen's d
commit a44fa29cde3338eb89fcb716157af07774ca5005
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Apr 19 16:26:55 2017 +0200
Fixed Cohen's d
commit b5463965898d6511fca877d7404b14dd2b87e3c4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Apr 19 15:05:26 2017 +0200
Changed Advanced Options to autohide
modified advanced options box to have a container and modified cpp file
to hide said container.
commit 7c5b8ed29153cd0fb0e0eeacbec382ff55639553
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Apr 19 13:29:11 2017 +0200
some style changes
commit 94eb0ab887169798cd77e019ea5a389e749f933a
Merge: b6149a14 9db8691c
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 19 11:53:29 2017 +0200
Merge pull request #1736 from boutinb/development
Make About box selectable
commit 9db8691c86090269c2768410fa28609e96e51380
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 19 11:33:57 2017 +0200
Make About box selectable
commit 2ab7e7ce80f4995b1fd7db4ecdc602bb839d4802
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Apr 19 11:04:39 2017 +0200
(1) credible intervals Bayesian correlation matrix and Bayesian correlation pairs, (2) p-values for sumstat Kendall's tau
R changes:
- give sensible p-values and BF for Kendall’s tau when n <=2
- Only partially cleaned up correlation.R
- added isTRUE in code for robustness reason
- Removed additional layer in the bfObject when it comes to ci. Check
for ci goes via bfObject$ciValue, say, 0.95, and the intervals are in
bfObject$ci$twoSided, bfObject$ci$plusSided, bfObject$ci$minSided.
- Example: bfObject$ciValue <- 0.95 and bfObject$ci$twoSided <- c(-0.3,
-0.2, 0.1). Tells me that the 95% CI is from -0.3 to 0.1. The point
-0.2 is the median.
Style:
- reordered the input in kendall tau functions, first data, then
parameters then hyperparameters: Data: n, tauObs. Parameters: tauPop,
Hyperparameters: kappa, var=1
- .bfKendallTau is a wrapper around .bfCorrieKernelKendallTau.
Basically, it switches between various methods and various variances
- Removed double function definitions in .correlationbayesianpairs.R
- renamed functions: (1) .credibleInterval to
.computePearsonCredibleInterval
UI son and ui, cpp:
- Bayesian Correlation matrix and pairs now have button for credible
intervals <- slot is called “credibleInterval” which is true or false,
percentage is now referred to as “ciValue”
commit b6149a14bc09db08a2680e37f50221b8aab38a99
Merge: c925a5ce badb8ee4
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Apr 18 09:51:36 2017 +0200
Merge pull request #1656 from SachaEpskamp/development
SEM udpates
commit 5c1f3051813af317c84adfea34f238c0c0363168
Merge: b41a15b8 c925a5ce
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 14:00:54 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit b41a15b839368a304a65eff3b75364ab30bed80c
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 14:00:38 2017 +0200
Fixed try-errors and added warnings in footnotes
made use of common function isTryError instead of inherits. isTryError
does not use "inherits" which could be a problem for objects with
multiple classes.
commit 07fffe34ac7194a289c3ae067438c93b91ae2db9
Merge: 1c5b7b02 3883a241
Author: vandenman <donvdbergh@hotmail.com>
Date: Mon Apr 17 12:36:08 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit c925a5cebd06a309b95ac3d6652a9ea575c08bce
Merge: c65e4b6f 07b2ee9f
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:21:56 2017 +0200
Merge pull request #1732 from FransMeerhoff/development
Prepare 0.8.1.2
commit c65e4b6f3dbca866f873371e4a1932aea14c9e10
Merge: 205ae4ae 7ec8ce98
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:21:04 2017 +0200
Merge pull request #1733 from boutinb/development
Make even rows more grey and keep them grey when they the table is not selected
commit 7ec8ce9818967ea877e810dfe95b4133e4af844c
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 13 16:13:41 2017 +0200
Make even rows more grey and keep them grey when they the table is not selected
commit 07b2ee9fa1ecd612ec200adb69ff3902ec3de1b6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Apr 13 15:57:37 2017 +0200
Prepare 0.8.1.2
Update version numbers
commit 205ae4ae9677851cdee941f59b971571b7169db0
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Thu Apr 13 13:58:14 2017 +0200
New pull request to add tims error handling to correlation (#1731)
* Added Tim Error Handling
Fixed issue #1677 with ANOVA table
* Added Tim Error Handling
Fixed issue #1677 with ANOVA table
* Merge branch 'development' of https://github.com/JohnnyDoorn/jasp-desktop into development
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
commit e62c15dd955f99e6b192c589c7bdae194c659610
Merge: fd051890 a91ef1a7
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 17:34:04 2017 +0200
Merge pull request #1726 from FransMeerhoff/development
ggplot2 problem
commit fd0518900d311eed56cf4c25464e0d29dce7ece1
Merge: 9025224d 17165d72
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 17:33:20 2017 +0200
Merge pull request #1730 from TimKDJ/development
Improved state retrieval
commit 17165d72f563db250ef8e0f1b981d95b4032ad82
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed Apr 12 17:29:29 2017 +0200
Improved state retrieval
commit badb8ee4a7df986a724a3aadd0063d244f439e51
Merge: 60a7e194 9025224d
Author: Sacha Epskamp <sacha.epskamp@gmail.com>
Date: Wed Apr 12 17:00:22 2017 +0200
Merge branch 'development' into development
commit a91ef1a771bf9f6f9a314cc5ff4ea9eaff5df9f1
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Apr 12 14:28:36 2017 +0200
ggplot2 problem
Principal Component Analysis and Exploratory Factor Analysis called
ggpltot2::theme with multiple argument
commit 9025224d759e369c090f10e39a09965b13699876
Author: Erik-Jan van Kesteren <erikjan.vankesteren@gmail.com>
Date: Wed Apr 12 16:28:31 2017 +0200
Save Image As - functionality (#1727)
* Add Save Image As EPS/PNG feature
* Add Save Image As EPS/PNG feature
* SaveImage clean code step 1
* test
* Edit hack solution
* remove warning
* SaveImage edits: remove width & height in cpp
* New redrawplot function
* Read height & width + overwrite possible
Also includes a dpi conversion fix
* Clean saveImage code & implement in descriptives
* Add saveimage menu option only if convertible
* tab align small fix
* Re-perform fix boxplot error bar width
* Stricter convertible functionality js
* Add documentation to /docs/development
* Rename documentation
* update md, add convertible img to ttest
* Add parsing convenience functions & adjust
.imgToResults and .imgToState
* Update saveimg documentation
* test change don
* test change back
* start on Anova
* deleted commented code
* more commented code deleted deleted
* t-test plot convert for saveimage
* Anova is now fully functional. Note that `convertible = TRUE`
* start on Anova
* deleted commented code
* more commented code deleted deleted
* Anova is now fully functional. Note that `convertible = TRUE`
* Updated all analyses with quick fix for eps figures
in EFA and PCA: Path diagram gives an error because library magrittr is
missing. Summary stats functions error because .extractErrorMessage is
missing.
* additional changes and backwards compatability with previously done analyses
* binom test first implementation eps
* Add tiff
* Cleanup EPS implementation
State logic moved to common
* Cleanup EPS implementation
* Overwrite png possible, cleanup descriptives
* Reintroduce lost "extracterrormessage" function
* fix bug plotfunc in summarystats
* dpi fix
using png device and dev.size()
* Fix dpi scaling issue
* Fix ggplot2 backwards compatibility
commit d6d7c2791093ea185ddd76dff3374ef280b84931
Merge: 65c9c14a 68b19b4e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 16:26:18 2017 +0200
Merge pull request #1728 from boutinb/development
Better SPSS synchronisation
commit 68b19b4eb49599beca9ac1338932d0931e7edc37
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 16:06:45 2017 +0200
Better SPSS synchronisation
commit 65c9c14a208ba9a999789ca081a81f00a2e17a77
Merge: c12f9055 a49df5cc
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Apr 12 13:54:09 2017 +0200
Merge pull request #1723 from FransMeerhoff/r_upgrade
Enable R 3.3
commit a49df5cc366687402cea40e0dd7c3102dea2640d
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Apr 11 19:10:45 2017 +0200
Update jasp-building-guide.md
Fixed up broken links due to spaces
commit c12f9055d80511395aaf9c0f1da72efaa4ddfa26
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Apr 11 19:10:45 2017 +0200
Update jasp-building-guide.md
Fixed up broken links due to spaces
commit d989b6e3dc81fa58a65513351d10165bd9ca769f
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Apr 6 14:32:38 2017 +0200
Enable R 3.3
commit 3883a2416c8f0621c9c52d58730c1b245b70ba36
Merge: a9209d8a 009c4b65
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 11:18:50 2017 +0200
Merge pull request #1717 from boutinb/development
Add tooltip to the Anova Model Widget to help make interactions
commit 009c4b65a1c123c46669d0df2955a9b2658c6678
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 11:04:48 2017 +0200
Add tooltip to the Anova Model Widget to help make interactions
commit a9209d8af0fa63c1113906b4e41b5c0e68798792
Merge: 5ec73983 b10a74a8
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:36:09 2017 +0200
Merge pull request #1707 from TimKDJ/bugfix/NALevel
t-test fix
commit 5ec739835848955985e0fcd5cd92a5e6306710f4
Merge: 8af04853 66dc1d5a
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:34:56 2017 +0200
Merge pull request #1709 from jasp-stats/TimKDJ-patch-2
Added state explanation
commit 8af04853aad4b2f1a99f6d74b65b8feed92a9b99
Merge: 8fe3c188 dd739671
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:34:35 2017 +0200
Merge pull request #1712 from TimKDJ/feature/BestModelTop
Compare BayesFactor output with best model
commit 8fe3c1887260f2c36af8c955db7833ef573b6007
Merge: dd87f95a 4adfaba2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Apr 6 10:16:33 2017 +0200
Merge pull request #1716 from FransMeerhoff/r_upgrade
Add RInside code to JASP-Engine
commit 4adfaba27704b003d9962463b6a1fd448b668702
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 2 17:22:00 2017 +0100
Add RInside code to JASP-Engine
The cpp code from the RInside package is added to the JASP-Engine.pro
commit 66dc1d5a11891f7c04f4509aabbeb64b531b0c7c
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Thu Mar 30 15:38:07 2017 +0200
Added state explanation
commit b10a74a896abf0e49f56f042d5a4ac048d2171a7
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 30 13:00:47 2017 +0200
Fix to NA levels and minimum obs amount
commit dd739671e40794215b99a337e740322fc72a9b96
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 30 10:52:51 2017 +0200
Best model top
commit dd87f95a039313b4284fda8e7481e3a4ef2f5a02
Merge: 0259ccef aba7aad6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 10:28:54 2017 +0200
Merge pull request #1706 from FransMeerhoff/development
Typo issue template
commit aba7aad67fa9dc0564ed5188d7d6d6e3119a76e7
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 09:47:21 2017 +0200
Typo issue template
Typo issue template
commit 0259ccef391eca417a8e6165678dc135e93fe1e4
Merge: 0e2645fd 2973e181
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 30 09:44:10 2017 +0200
Merge pull request #1705 from FransMeerhoff/development
update issue template
commit 2973e18127f6082dde9a0c4cb9b414832428373a
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 30 09:37:29 2017 +0200
update issue template
Make a distinction between enhancement request and bugs
commit 1c5b7b02414f7275dfe06629f679418d0355d59f
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Mar 29 00:08:15 2017 +0200
Added missing value handling and Greatest lower bound
In addition: some minor code cleaning (changing `=` into `<-` ); added a
footnote warning a user that three or more variables are required for
the glb; using a try construction for the glb since it is error prone.
TODO: check why psych::alpha(d, key) can run while psych::glb(d, key)
errors for the same input.
commit 74b147ce9f7d747f0254d4d74d8fdbaaa88b8c6d
Merge: edd69b08 acb373f2
Author: vandenman <donvdbergh@hotmail.com>
Date: Tue Mar 28 19:48:53 2017 +0200
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 0e2645fda85af6299911cefcdd66d5a21fcaf5b5
Merge: acb373f2 c6aaef1e
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 28 10:38:29 2017 +0200
Merge pull request #1701 from boutinb/development
About box on Mac does not work
commit c6aaef1e4dca136d0ac551fd24bcb9ca02950d23
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 28 10:32:08 2017 +0200
About box on Mac does not work
Solves #1700
commit acb373f23dccbf87c66f49beb6cdc13dbcdd426c
Merge: 794b38f8 4ee4569b
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:49:20 2017 +0100
Merge pull request #1686 from silberzwiebel/development
Added build instructions for Fedora
commit 794b38f84957a5078a69d8f4ad023b884af835fc
Merge: 04df2733 638d60c5
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:48:51 2017 +0100
Merge pull request #1688 from akashrajkn/fix/summary-stats
Fixed the BF10 bug in posterior plot
commit 04df2733894186b825a1dd6b7f518482088eaaa4
Merge: b6e11ded 88cf26ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:46:17 2017 +0100
Merge pull request #1696 from boutinb/development
Crash when open a JASP file after closing another one
commit 88cf26ed0ee086a625c2b84896f1e73a23be709a
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 23 14:44:50 2017 +0100
Change variables can crash when an analysis was deleted
commit 41b8512d1293f78dcceea4c9650b1ecd85ef4aad
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 22 10:57:11 2017 +0100
Crash when open a JASP file after closing another one
When closing, the analyses must be internally deleted.
commit b6e11deddb7a5b4fc5045fa3a0f840a44f5f1e0f
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 21 14:24:53 2017 +0100
Remove TestFiles.zip from installer in mac
commit b8bfd96dcd18cd39ef9fafa9113c12fd6d69df1f
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 21 12:12:16 2017 +0100
Set right citation for analyses
commit 638d60c51e7dcef8487ceb97289a0403f344eda1
Author: akashrajkn <akashrajkn@gmail.com>
Date: Sun Mar 12 10:30:55 2017 +0530
Fixed the BF10 bug in posterior plot
commit 4ee4569bc25839b06d733ff41035e7e2ef8a6cb5
Merge: 00905323 9981ad9c
Author: silberzwiebel <silberzwiebel@users.noreply.github.com>
Date: Fri Mar 17 09:26:17 2017 +0100
Merge pull request #1 from silberzwiebel/silberzwiebel-patch-fedora-build
Added build instructions for Fedora
commit 9981ad9c8576478b8487dd8ae3baee1b5f04dcb2
Author: silberzwiebel <silberzwiebel@users.noreply.github.com>
Date: Fri Mar 17 09:25:24 2017 +0100
Added build instructions for Fedora
After I had some troubles some months ago (see https://github.com/jasp-stats/jasp-desktop/issues/1507 ) I wanted to look at the new release and managed to compile it under Fedora using these instructions. I thought, they might be better in a central place then only at my PC.
commit 00905323a97e1e4200d9740244e69bcef2285e93
Merge: b09e227a eb3e376d
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 17:31:07 2017 +0100
Merge pull request #1685 from TimKDJ/bugfix/levelCheck
Omit NA's from the factor level check
commit eb3e376d827aaeb1b2b573071dc00770010d4876
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Mar 16 17:24:50 2017 +0100
Omit NA's from the factor level check
commit b09e227a5e3375770ca39d2ae5b64195c9fffd24
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 16:53:35 2017 +0100
Set Version for 0.8.1.1
commit 1951c8d4df2645a9e2f09063c6f5f47cc971b37e
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 16:49:44 2017 +0100
Fixes #1672: JASP crashes loading CSV
commit a3dc1fa83e22d947103dcb75ced20567b6bea0d0
Merge: 892647e5 343d3c34
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 16 15:56:57 2017 +0100
Merge pull request #1679 from AlexanderLyNL/patch-2
Update r-style-guide.md
commit 892647e5f3abdee5a50655a50a6caf096298b5c7
Merge: 7c2f7b9e 0288beda
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Mar 16 13:34:28 2017 +0100
Merge pull request #1680 from AlexanderLyNL/development
Small init bug fixed
commit 7c2f7b9e6785de58a358c38ccb58d68cd8421ddc
Merge: 8ad4fb87 e3313818
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Mar 16 10:04:37 2017 +0100
Merge pull request #1681 from akashrajkn/issue-template
Added ISSUE_TEMPLATE
commit e3313818c736d8da228a879316b53232a064ba54
Author: akashrajkn <akashrajkn@gmail.com>
Date: Thu Mar 16 11:12:28 2017 +0530
Added ISSUE_TEMPLATE
commit 0288beda9618c994d67db67798159d51aaa617a9
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 22:24:55 2017 +0100
Added comments to code
commit a3429f4ff7862b5a07e1bceb549ebe2842be487a
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 19:01:15 2017 +0100
Small init bug fixed
commit 343d3c34774a7c5e7103276fc0e1579cf11b0769
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Mar 15 17:25:21 2017 +0100
Update r-style-guide.md
commit 8ad4fb87e731049d2dcddbd53648055c32ec39bd
Merge: 90d7b273 7d26deec
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:52:33 2017 +0100
Merge pull request #1659 from TimKDJ/bugfix/slowBayesianAnalyses
Solution for the slow Bayesian init
commit 90d7b273c371895acc9eb9b3463abcd9a8c557ca
Merge: 4a45854d 649f2ad9
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:50:11 2017 +0100
Merge pull request #1673 from AlexanderLyNL/development
Added dormant replication BF for the correlation, cleaned out code
commit 4a45854ddc848e41207ba5b4cc76bdde95b76cb3
Merge: 47387245 09319845
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 15 16:48:51 2017 +0100
Merge pull request #1676 from FransMeerhoff/development
Generate log file on Windows
commit 649f2ad982d6ca424b33d776c1f9330591a290ac
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Tue Mar 14 22:07:02 2017 +0100
added some small remarks in the style guide
commit 093198451b0c1cd36279ade918ca93ce2aeed7a1
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Mar 14 16:35:07 2017 +0100
Generate log file on Windows
Enable giving output on windows by starting JASP from the command line
by typing <installdir>\JASP.exe > c:\temp\JASP.log
commit 47387245b6df3ac5cb536272581d6e5d4781e0e1
Merge: 3b83ecac 8f0bd409
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 14 15:06:28 2017 +0100
Merge pull request #1675 from boutinb/development
Add resize column in data view
commit 8f0bd409ecd85c59dc74dff44faf31588c4a9dd0
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 14 14:52:02 2017 +0100
Add resize column in data view
commit c3c62c5a1811c2467d67dc3406c6ae324f084618
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Mar 13 16:33:41 2017 +0100
Style guide updated
Style guide updated
commit 74603bd375708ae89f71f2cc367167d6b5cf6203
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Mon Mar 13 11:19:34 2017 +0100
Added call statement
- bfObject$call tells you the R code
- obsR, obsN changed to rObs and nObs
commit edd69b082b81bbed409e7bb0ec6f42f23d743f66
Merge: 31087d15 3b83ecac
Author: vandenman <donvdbergh@hotmail.com>
Date: Sun Mar 12 10:27:12 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 0dfc145344daaada556da45a6f9d2177f061f6e6
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sat Mar 11 16:53:21 2017 +0100
Fixed the combined one-sided bfs
commit f57e13d7a0d62161f3eeddc6af92b06952f39b63
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Sat Mar 11 14:20:27 2017 +0100
Added dormant replication BF for the correlation, cleaned out code
Added:
- isTryError in common
- .bfPearsonCorrelation, a wrapper around .bfCorrieKernel that loops
over the methods automatically
- Rewrote .bfCorrieKernel. The method numbers in .bfCorrieKernel now
refer to 1. exact likelihood, 2. jeffreysApprox likelihood, 3.
Savage-Dickey beta approximation to the likelihood, 4. Marsman sampler,
5. Jeffreys asymptotic approximation, 6. Error. Thus, numerical is
swapped for Savage-Dickey beta approximation
- .bfHypergeo is a wrapper for method 1 and 2. Automatically switches
from hypergeometric result to numerical integration whenever the
two-sided bf10 > 10^(hyperGeoOverFlowThreshold)
- Added .bfCorrieRepJosine, which is not activated in the UI.
.bfCorrieRepJosine takes on the role of .bfCorrieKernel for replication
(summary stats) data.
Changed (mostly style changes):
- camelCases: Changed variable.names to variableNames to adhere to the
style guide
- all.bfs to bfObject
- some.r to obsR
- .jeffreysApproxH function to . hJeffreysApprox
- changed return(NaN) to return(NA) in .bf10Exact - though I had some
semantical reasons to use NAN instead NA, but this can be solved by
identifying NULL to not calculated yet
- changed function call by name rather than position
- added name spaces to some functions calls, such
- removed base name space for is.infinite
Removed:
- Removed .bf10Numerical, it isn’t used anyways, but hard coded in
commit 3b83ecaccdf24db95e1028b5b0926c67833d8c9e
Merge: 29c332d1 484c811d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 8 13:24:36 2017 +0100
Merge pull request #1663 from TimKDJ/patch-1
Added/clarified error handling documentation
commit 29c332d1b158c35451d9bbe26f8bf8974fdf2517
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Wed Mar 8 13:24:16 2017 +0100
Enhancement error handling (#1664)
* Documentation for creating module added
* Fixed flashing of options window after stacktrace click
* Update make-dmg script
* Set min size for preferences dialog
* Bug fixes Reliability analysis (#1650)
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
* Ignore extracted testfiles
* Make the preferences dialog bigger
* Synchronzation with OSF Files
* Refine tooltip messages
The tooltip on the column is split into a separate tooltip for the icon
and column name
* Remove ? mark on Preferences dialog
Remove ? mark on Preferences dialog.
Appears only on Windows
* File from examples should not be editable.
* Added tests SEM module
From Sacha :
Added
HolzingerSwineford1939_covmat.jasp and MeasurementInvariance.jasp
* Fixed RM ANOVA so that factor names can be changed with correct consequences for the tests
* Change tooltip on scale column header.
* Remove optionforms relicts (#1662)
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Added support for custom checks, various improvements
commit 77c22ea47ee6c3e75871a43e6153b9a88a415985
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 8 12:14:30 2017 +0100
Small bug on sync
commit ac75916896287dd35245261cb6fed7d7c9c7de21
Merge: db7ae625 efef726c
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 7 11:36:01 2017 +0100
Merge pull request #1665 from FransMeerhoff/development
Update Mac build script
commit db7ae62501e6724b97d13b668b31c9e8f14fd0fd
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Mar 7 11:32:27 2017 +0100
Variable Window updates
Add tooltip.
Remove vertical header.
Add background color for values
Don’t refresh analyses when label did not change
commit efef726c24d7a39cb858281ca05f34990a947da6
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Mar 7 11:07:49 2017 +0100
Use parameter for Info.plist.template
Use the JASP_DESKTOP parameter to copy to proper location.
commit 484c811d8bfe5972ebb38d17def6974bc8ec2d0a
Author: Tim de Jong <tim_jong@hotmail.com>
Date: Mon Mar 6 14:59:13 2017 +0100
Added custom explanation and some clarifications
commit bd7951c1710617ce62b037705720fd103a2d28fa
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 16:51:19 2017 +0100
Remove optionforms relicts (#1662)
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
* Remove optionforms relicts
Some part of the already removed optionsform.ui still remained
commit 0aeb84801ee1ad0850c436f3ad1528484edc5c68
Merge: 34856706 012db9a6
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 16:44:10 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 34856706a9516bee62ebb7b2bd065b1483b9179e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 16:43:27 2017 +0100
Change tooltip on scale column header.
commit 012db9a6a4d648384251e0ba0f4665503a656219
Merge: 757a3f19 a651e44f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Mar 1 15:56:58 2017 +0100
Merge pull request #1660 from JohnnyDoorn/development
Fixed RM ANOVA names for post hoc tests
commit a651e44f7589e3ac9dc042f532d5490f9fd9e63a
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Mar 1 15:51:21 2017 +0100
Fixed RM ANOVA so that factor names can be changed with correct consequences for the tests
commit 757a3f19652f53df4b1144ae7890a78e7ff1c2d6
Merge: 9f898d4a ada6f205
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 15:37:05 2017 +0100
Merge pull request #1658 from FransMeerhoff/development
Added tests SEM module
commit 7d26deec2e87300c631d61f4898f2e67e0911a8b
Author: TimKDJ <tim_jong@hotmail.com>
Date: Wed Mar 1 11:15:50 2017 +0100
Solution for the slow Bayesian init
commit ada6f205f56e6843521768611b746d429ee90942
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Mar 1 09:21:59 2017 +0100
Added tests SEM module
From Sacha :
Added
HolzingerSwineford1939_covmat.jasp and MeasurementInvariance.jasp
commit 9f898d4a12de353edae37c33ef5a31d25e5ea736
Merge: ccff6603 517b1d34
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 14:28:17 2017 +0100
Merge pull request #1657 from FransMeerhoff/development
Remove ? mark on Preferences dialog
commit ccff66030fdbf810561f792b230706123883d26b
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 14:11:16 2017 +0100
File from examples should not be editable.
commit 517b1d347c97c1edede64026663ee52174e96712
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 23 16:07:33 2017 +0100
Remove ? mark on Preferences dialog
Remove ? mark on Preferences dialog.
Appears only on Windows
commit d90376dbc9fb47833fbc572fec375fbf07e664cc
Merge: 83c29dd4 6f7b5b4b
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 28 10:56:30 2017 +0100
Merge pull request #1654 from FransMeerhoff/development
Refine tooltip messages
commit 60a7e1942f0dd2c30258c7acb1f84d8a012dc184
Author: Sacha Epskamp <mail@sachaepskamp.com>
Date: Fri Feb 24 18:11:37 2017 +0100
SEM udpates
SEM updates: Multiple models, covariance matrix as input, measurement
invariance tests.
commit 6f7b5b4b0b27d2cb55218335f1c73cc526df9e09
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 23 11:25:17 2017 +0100
Refine tooltip messages
The tooltip on the column is split into a separate tooltip for the icon
and column name
commit 83c29dd4371c322a2959773fa4ea8ff50035dfe5
Merge: 104dd0d5 8b167140
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 15:58:29 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 104dd0d51e96aa68b2fba2eb5e8c8c333eccae5b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 15:57:52 2017 +0100
Synchronzation with OSF Files
commit 8b167140e83835fb309630e523217605c4e745ff
Merge: d6edb06b 15a3415d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:44:28 2017 +0100
Merge pull request #1651 from FransMeerhoff/development
Ignore extracted testfiles
commit d6edb06b0cbef32d611be361e1763328b2a67a90
Merge: 4233cf0c e6540fab
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:40:59 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit 4233cf0ce452962de319595abe29ed9d859186d0
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 13:40:28 2017 +0100
Make the preferences dialog bigger
commit 15a3415d67739f6fe92f003f006674047aca2498
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 22 12:28:28 2017 +0100
Ignore extracted testfiles
commit 31087d15c0456868aea21c8d74782be2ae7cc907
Merge: 81b9b768 9feba33e
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 12:10:52 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit e6540fab0eebcb4d05dfbb6537b6268b88411d97
Merge: dc1fe7dd e08d9202
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 12:09:56 2017 +0100
Merge pull request #1645 from TimKDJ/bugfix/stacktraceWindowFlashing
Prevent window change after stacktrace click
commit dc1fe7dd66b03b93dca4fa26823d83a033c61777
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 12:08:55 2017 +0100
Bug fixes Reliability analysis (#1650)
* bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
* clearer comment
* a more appropriate bug fix using Tim's suggestion
* Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
commit 81b9b768cdcb30148100879e71a9829b6c2acf1a
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 22 10:31:01 2017 +0100
Change in showing errors
Errors are shown if 1 variable is present with an error, instead of if >
1 variable is present.
commit 9feba33e85bed835af330273b6a8760185f94f75
Merge: b5f4df81 60ff447d
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 09:53:41 2017 +0100
Merge branch 'development' of https://github.com/jasp-stats/jasp-desktop into development
commit b5f4df819dd81720f35bc4cc68e6e82119389d16
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 22 09:51:58 2017 +0100
Set min size for preferences dialog
commit 60ff447d0d45186862622ac90006f69311ed80d2
Merge: 3aebe5a1 11a20eed
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 21 09:58:55 2017 +0100
Merge pull request #1646 from akashrajkn/docs/add-module
Documentation for creating a jasp-module
commit ec42171203939872633f12f1fe5a53a748087b61
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 16:00:11 2017 +0100
a more appropriate bug fix using Tim's suggestion
commit 3ac745459c5d648b1be5904040a97f68cffdf72b
Merge: bd69b33d 3aebe5a1
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 15:43:46 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 3aebe5a10f2f6fdd750d28d722282f729e2a0bd6
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Feb 17 11:55:57 2017 +0100
Update make-dmg script
commit 11a20eed45a2b7bb42be9df19f1e200cb53e3b50
Author: akashrajkn <akashrajkn@gmail.com>
Date: Wed Feb 8 14:40:45 2017 +0100
Documentation for creating module added
commit bd69b33de89f0804fe43718a023aa7310c13a7c0
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 10:15:54 2017 +0100
clearer comment
commit 7a36c8122170f49c373dc207637fe05f23ca141d
Merge: 9cbf62a3 335c549a
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 01:06:17 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 9cbf62a385b141af00550a7799c45076b715b051
Author: vandenman <donvdbergh@hotmail.com>
Date: Fri Feb 17 01:05:23 2017 +0100
bug fixes for release 0.8.1.0 part I
I think something changed in .hasErrors() which influenced the init
phase resulting in some weird bugs.
commit 96055e897145fa6ac70facf4f822b672c528dcad
Merge: bae9bc85 49144519
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 21:42:38 2017 +0100
Merge branch 'ReliabilityUpdates' of https://github.com/vandenman/jasp-desktop into ReliabilityUpdates
commit bae9bc85640f6db7bdab169f4acbcf607a51609e
Merge: 6cbb3c94 68f46fa3
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 21:22:01 2017 +0100
Merge remote-tracking branch 'refs/remotes/origin/development' into ReliabilityUpdates
commit e08d920292543dd8efe51685cafb239dafb6a4e8
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 17:26:01 2017 +0100
Fixed flashing of options window after stacktrace click
commit 335c549a710e78c8546715c4f153cbb55482dcca
Merge: 4d1b031c bdd841ed
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 16:20:55 2017 +0100
Merge pull request #1644 from TimKDJ/bugfix/errorBoxSize
Resizing of analysis box when an error is added
commit bdd841edb68ac3086ccf7e75f60f0cf220549ff6
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 16:13:46 2017 +0100
Resizing of analysis box when an error is added
commit 4d1b031c6a2e2455727ba1f0997095b419dc8b75
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 16:12:50 2017 +0100
variable window layout
commit 49144519fc146edf0f9f03389629723b273ebee0
Merge: 30b542ec 00265fcf
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 14:58:47 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 00265fcf6834e68c576c2ba7fd5d408569657527
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:49:21 2017 +0100
Crash after double-clicking when no data is loaded
commit 77d7c8b9b8d1a67288a867cac5a70c89d23869e2
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:28:23 2017 +0100
Wrong label when missing value in ODS
commit 0b1910b56b963534ee2f49fa450d4dd4b7322819
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 14:15:35 2017 +0100
Add warning when default spreadsheet editor not found
commit 30b542ec25b805a91a2b8aa34da62299bf7470bd
Merge: 4be95fee c675a4a7
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 11:34:38 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 4be95fee9e494199751f2a20a0de69a943477052
Merge: a81e8ba0 f1fd60c2
Author: vandenman <donvdbergh@hotmail.com>
Date: Thu Feb 16 11:16:25 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit c675a4a7dc63a40b9a85852d7323e05c705bc146
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 11:15:12 2017 +0100
Remove orig file from pro file
commit f1fd60c2c5176894c52021b644d4e13e170d12d0
Merge: 59653cc5 7db2b5c5
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:42:53 2017 +0100
Merge pull request #1603 from TimKDJ/Enhancement/descriptivesBayesianAnova
Descriptives Bayesian ANOVA
commit 59653cc5830578b71a2e81c01d62ec0136687bc8
Merge: 1ad201e7 75c5c4fb
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:26:05 2017 +0100
Merge pull request #1642 from TimKDJ/development
Typo, comment cleanup and stack trace bug
commit 75c5c4fb2c6743f33071fb26c3696348e54c4f05
Author: TimKDJ <tim_jong@hotmail.com>
Date: Thu Feb 16 10:14:49 2017 +0100
Typo, cleanup and small stack trace bug
commit 1ad201e74417e87392ba2cedd7e8a5d5c250bcf3
Merge: 0d3dde7b 7a0feace
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:03:14 2017 +0100
Merge pull request #1641 from boutinb/development
Beter handling with spss file
commit 7a0feace049b2142e1fee2695160624a20366d66
Author: bruno boutin <b.boutin@uva.nl>
Date: Thu Feb 16 10:01:42 2017 +0100
Beter handling with spss file
commit 0d3dde7ba7d1e71e3f0a7d05f57af696310c8f19
Merge: 307f90e4 f767fa1d
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 20:50:26 2017 +0100
Merge pull request #1639 from FransMeerhoff/development
Update psych R package from 1.4.8.11 to 1.6.12
commit a81e8ba0cfebba6b2bc19b0442bb10fb717beb66
Merge: 6cbb3c94 307f90e4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 19:45:59 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit f767fa1d7d270db7efe97907be8c0c531f59f5a0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 18:14:31 2017 +0100
Update psych R package from 1.4.8.11 to 1.6.12
Update psych R package from 1.4.8.11 to 1.6.12
commit 307f90e4984271a11ec25a1d23e6051d48f653fd
Merge: 0f2893aa 82c1d13e
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:54:47 2017 +0100
Merge pull request #1638 from boutinb/development
Add tooltip in table view
commit 82c1d13edb6e86226191289a181c431fc203bab3
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:54:14 2017 +0100
Add tooltip in table view
commit 68f46fa3833c2464fe89b77b83dfc26d67c352a6
Merge: b54b7d22 471bfbf4
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 17:25:49 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into development
commit 0f2893aa8e27e50d6e2785376c4a988d0af08a2a
Merge: 2a5bac77 ba40399b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:21:23 2017 +0100
Merge pull request #1637 from boutinb/development
Error when filename contain #
commit ba40399b6e7b2e28975895f3463844db00522fdd
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 17:20:45 2017 +0100
Error when filename contain #
commit 2a5bac7745fe0a45c7ab011c91d05aa480eda75b
Merge: 471bfbf4 98d40573
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 16:51:33 2017 +0100
Merge pull request #1636 from boutinb/development
Set file name when exporting data
commit 98d40573a6b99ed538a3857f5013e7143e7b0116
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 16:50:46 2017 +0100
Set file name when exporting data
commit 471bfbf46d65713ca9c7efdbcdd802eb25790993
Merge: af12357d 277b345a
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 15:34:22 2017 +0100
Merge pull request #1635 from boutinb/development
Compile Error on odssheetcell
commit 277b345aec0c166002e0836197415301360f608b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 15:33:57 2017 +0100
Compile Error on odssheetcell
commit af12357da3ef46df4003d06e89d2a4cea784c783
Merge: 92e9dd00 26c0a289
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 14:39:20 2017 +0100
Merge pull request #1634 from boutinb/aknight1-uva-development
Aknight1 uva development
commit 6cbb3c94c24adef121756b932a980632f86338ea
Merge: 2cbfc171 92e9dd00
Author: vandenman <donvdbergh@hotmail.com>
Date: Wed Feb 15 14:33:30 2017 +0100
Merge remote-tracking branch 'refs/remotes/jasp-stats/development' into ReliabilityUpdates
commit 26c0a28968515afc84e57b9b2e40cd61eac27cbf
Merge: 92e9dd00 c310311b
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 14:32:18 2017 +0100
ods support
commit 92e9dd00d21470b3ad0a3240192f4048b793df9b
Merge: 0e8535d7 02038a34
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:56:03 2017 +0100
Merge pull request #1633 from vankesteren/development
Add easter egg to javascript console
commit 02038a342a136b716a9e26ed8e0ba4b2d42ec46d
Author: vankesteren <erikjan.vankesteren@gmail.com>
Date: Wed Feb 15 13:53:45 2017 +0100
Add easter egg to javascript console
link to the github page
commit 0e8535d732eac9f8d4c687135495e45fc6371f3c
Merge: a15952e1 090c001f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:14:50 2017 +0100
Merge pull request #1632 from boutinb/development
preferred typo
commit 090c001f0b14afe090e7bcebdcf6c25a3283a9d8
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:13:56 2017 +0100
preferred typo
commit a15952e1e2a2922ccd899a4d162f503fbdf2a0a1
Merge: 2eda2184 b66ac3b5
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:06:11 2017 +0100
Merge pull request #1631 from FransMeerhoff/development
Change default application folder different platforms
commit 2eda2184a2060cbcc9898e3eeb434ec1d2077154
Merge: 9639f7c4 82db5523
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:04:29 2017 +0100
Merge pull request #1630 from boutinb/development
Sync dataAutoSynchronization changes with watcher
commit b66ac3b5f2ed22102bad3effe56ae09ed34ea406
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 13:03:31 2017 +0100
Change default application folder different platforms
For OSX, Windows, Linux a different application folder is selected
commit 82db55230c11c3717d729cdee7b2f0654027df97
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 13:02:18 2017 +0100
Sync dataAutoSynchronization changes with watcher
commit 9639f7c4f9956bad4d340d0be12bf718cd35ea7b
Merge: 305ec5cf c3c3433c
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 12:36:56 2017 +0100
Merge pull request #1629 from boutinb/development
Remove cvs association with JASP
commit c3c3433cf2be7a0526271f299dbc2566eb4ba221
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 15 12:36:21 2017 +0100
Remove cvs association with JASP
commit 305ec5cf1a1eda29dfa56fa7e13d463ebb9e7092
Merge: 8db18b08 e0272af0
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 15 09:26:56 2017 +0100
Merge pull request #1628 from FransMeerhoff/update_testfiles
Add new JASP testfiles
commit e0272af0c43c7c5f24759ee0f735e84d5ae07fa7
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 23:14:01 2017 +0100
Add new JASP testfiles
Added
testFileANOVA_RM.jasp
testFileCorrelation.jasp
commit 8db18b0884a93dc674fe402c4d84345682babae4
Merge: 81418f2a c3ec3d57
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 17:49:15 2017 +0100
Merge pull request #1627 from FransMeerhoff/preferences
Add Preference Dialog
commit c3ec3d57d2495937ff0bca953807443609e07d43
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 00:32:12 2017 +0100
Add Preference Dialog
A preference dialog is added for synchronization parameters.
commit 81418f2ab4c64b8ec0ae82f9eeb4ae35c75d47d4
Merge: b66a43e1 5d332033
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 17:13:47 2017 +0100
Merge pull request #1626 from boutinb/development
Add edit feature by double-clicking the data
commit 5d3320335659fc3a6070f8669f659e38a65b5f30
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 17:12:14 2017 +0100
Add edit feature by double-clicking the data
commit b66a43e10686f31ab73aaad260ff19dee10dc117
Merge: 2be6bebd 444066f7
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 14 15:54:22 2017 +0100
Merge pull request #1625 from akashrajkn/bugfix
Bugfix
commit 444066f72c3930b29b169661d672a61ea4ea19d6
Author: akashrajkn <akashrajkn@gmail.com>
Date: Tue Feb 14 15:48:35 2017 +0100
remove previous error in the output
commit f1b7e2def77dac272a1fd4978269baa007ad639c
Author: akashrajkn <akashrajkn@gmail.com>
Date: Fri Feb 10 13:20:11 2017 +0100
innerHTML QString bug fixed for linux build
commit 2be6bebd0a24c82c7c9d6259432b71313441d539
Merge: d79ba2a5 8183a1cb
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Tue Feb 14 12:01:45 2017 +0100
Merge pull request #1623 from FransMeerhoff/development
Bug Variables Window
commit 8183a1cbfc4cf20923f280a2548ffe8523dd5385
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Thu Feb 9 17:45:36 2017 +0100
Bug Variables Window
When clicking on a column not counting values JASP crashes
commit d79ba2a558740a993ac96562661c926ee2221f8e
Merge: c71c2a54 8a5a9a44
Author: bruno boutin <b.boutin@uva.nl>
Date: Fri Feb 10 16:32:00 2017 +0100
Merge pull request #1619 from AlexanderLyNL/development
Added: p-values to SumStats module
commit 8a5a9a442e244a66f23168ea88b94f613905ed73
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Thu Feb 9 22:40:02 2017 +0100
Added namespaces to some functions
commit c71c2a5408ac2b5c61ef9ccc5f0f649f1c591576
Merge: b71029a4 fc766abe
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:23:00 2017 +0100
Merge pull request #1621 from FransMeerhoff/development
Update JASP Testfiles
commit b71029a4b5e0ac85eab02c6188a2a4428ce45af2
Merge: 68760b53 467dbeb3
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:22:41 2017 +0100
Merge pull request #1622 from boutinb/development
Add Labels from SPSS
commit 467dbeb346ee992c402a0f89cce9564c1ed8aa4f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 18:17:40 2017 +0100
Add Labels from SPSS
commit fc766abe2f28fbbba9beade6b67bec3af74543f2
Author: FransMeerhoff <F.A.M.Meerhoff@uva.nl>
Date: Wed Feb 8 16:52:00 2017 +0100
Update JASP Testfiles
Added :
BayesContingencyTables.jasp
BayesLogLinearRegression.jasp
FreqContingencyTables.jasp
FreqLogLinearRegression.jasp
SumStatsModule.jasp
ReliabilityAnalysis#1613.jasp
commit fb5779bf74325a02d3ab233696e03c952282845f
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Feb 8 14:53:54 2017 +0100
pValue in SumStat - Kendall's tau
Avoid SuppDists for the moment and use approximation instead.
TODO: Add SuppDists package in the library.
commit 68760b53ad6cdcb488d227bdea4b88b97d7fc7b9
Merge: b823e0bb 783a616f
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 14:32:01 2017 +0100
Merge pull request #1620 from JohnnyDoorn/development
Updated post-hoc tests for repeated measures anova
commit 783a616fbceb2682d889570ea0be60cb500420da
Author: JohnnyDoorn <johnnydoorn@gmail.com>
Date: Wed Feb 8 14:08:51 2017 +0100
Ancova: changed two names, so the plot sizes adjust when either width or height are adjusted.
Repeated measures: Fixed post-hoc tests issues - changed pooled error to unpooled error
Repeated measures gui: made bonferroni the default test
commit a83164ca48360108d4a1dd78499061128d4b7e18
Author: AlexanderLyNL <Alexander.Ly.NL@gmail.com>
Date: Wed Feb 8 12:19:47 2017 +0100
Added: p-values to SumStats module
Added p-values to sumstats
commonsummarystatsttestbayesian
- .pValueFromT output to a list producing all three p-values at the
same time
Checked all dependencies on the repository.
- summarystatsttestbayesianindependentsamples.R
- summarystatsttestbayesianonesample.R
- summarystatsttestbayesianpairedsamples.R
Add: .pValueFromCor output a list
summarystatscorrelationbayesianpairs
Change: correlation output title for Kendall from “t” to “tau"
TODO:
- Discrepancy between cor.test method=“kendall” and the SuppDists
package
- Add SuppDists package to library
- Change plot functions for it take bfObjects
commit b823e0bba28da444c5803b4c53b787e9fdd8a3b1
Merge: 613773f8 dd82c184
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 09:38:44 2017 +0100
Merge pull request #1618 from boutinb/development
Do not warn user if sync data file does not exist.
commit dd82c18499bf5cd58878e8550490711832b694eb
Author: bruno boutin <b.boutin@uva.nl>
Date: Wed Feb 8 09:38:03 2017 +0100
Do not warn user if sync data file does not exist.
commit 613773f898171880a05ec36114faceee2e26d839
Merge: 9b5e361f 86e2a54c
Author: bruno boutin <b.boutin@uva.nl>
Date: Tue Feb 7 17:14:32 2017 +0100
Merge pull request #1617 from boutinb/development
Clear default options of analyses when closing file
commit 9b5e361f1400ba51d4c20b259833cc44739abe55
Merge:…
boutinb
pushed a commit
that referenced
this pull request
Jan 24, 2020
* Include Bayesian meta-analysis in JASP * Create unit tests for the Bayesian meta analysis (#1) * remove comments * changes for feedback Don * fix subscripts * fix gettext studylabels * fix syntax error * Fix some issues related to the review changes * fixed couple gettexts * Add JASP.widgets import * skip untestable unit tests Co-authored-by: Koen Derks <koen-derks@hotmail.com> Co-authored-by: Tim de Jong <tim_jong@hotmail.com>
Vpedata
pushed a commit
to Vpedata/jasp-desktop
that referenced
this pull request
Feb 7, 2020
* Include Bayesian meta-analysis in JASP * Create unit tests for the Bayesian meta analysis (jasp-stats#1) * remove comments * changes for feedback Don * fix subscripts * fix gettext studylabels * fix syntax error * Fix some issues related to the review changes * fixed couple gettexts * Add JASP.widgets import * skip untestable unit tests Co-authored-by: Koen Derks <koen-derks@hotmail.com> Co-authored-by: Tim de Jong <tim_jong@hotmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updating of Frequency analysis