diff --git a/CircularStatistics/DESCRIPTION b/CircularStatistics/DESCRIPTION deleted file mode 100644 index 501baf7..0000000 --- a/CircularStatistics/DESCRIPTION +++ /dev/null @@ -1,11 +0,0 @@ -Package: DevelopmentModule -Type: Package -Title: Circular Statistics Module for JASP -Version: 1.0.0 -Date: 2019-05-03 -Author: Aaron Bahde (Berens Lab, University of Tuebingen) -Website: jasp-stats.org -Maintainer: JASP Team -Description: This module offers basic methods for directional data. -License: GPL (>= 2) -Imports: circular \ No newline at end of file diff --git a/CircularStatistics/inst/DESCRIPTION b/CircularStatistics/inst/DESCRIPTION deleted file mode 100644 index fd34b9f..0000000 --- a/CircularStatistics/inst/DESCRIPTION +++ /dev/null @@ -1,10 +0,0 @@ -Package: DevelopmentModule -Type: Package -Title: Circular Statistics Module for JASP -Version: 1.0.0 -Date: 2019-05-03 -Author: Aaron Bahde (Berens Lab, University of Tuebingen) -Website: jasp-stats.org -Maintainer: JASP Team -Description: This module offers basic methods for directional data. -License: GPL (>= 2) \ No newline at end of file diff --git a/CircularStatistics/inst/NAMESPACE b/CircularStatistics/inst/NAMESPACE deleted file mode 100644 index e69de29..0000000 diff --git a/DESCRIPTION b/DESCRIPTION new file mode 100644 index 0000000..f839477 --- /dev/null +++ b/DESCRIPTION @@ -0,0 +1,11 @@ +Package: CircularStatistics +Type: Package +Title: CircularStatistics Module for JASP +Version: 1.0 +Date: 2019-10-01 +Author: Aaron Bahde, Philipp Berens (University of Tuebingen) +Website: eye-tuebingen.de/berenslab +Maintainer: Philipp Berens +Description: This module offers basic methods for directional data +License: GPL (>= 2) +Imports: circular, ggplot2 diff --git a/CircularStatistics/NAMESPACE b/NAMESPACE similarity index 87% rename from CircularStatistics/NAMESPACE rename to NAMESPACE index 93b73d2..029d8f3 100644 --- a/CircularStatistics/NAMESPACE +++ b/NAMESPACE @@ -2,3 +2,4 @@ export(CircularStatisticsDescriptives) export(CircularStatisticsOneSampleTests) export(CircularStatisticsMultipleSampleTests) import('circular'); + import('ggplot2'); diff --git a/CircularStatistics/R/circdescriptives.R b/R/circdescriptives.R similarity index 100% rename from CircularStatistics/R/circdescriptives.R rename to R/circdescriptives.R diff --git a/CircularStatistics/R/circtestsmultiplesample.R b/R/circtestsmultiplesample.R similarity index 100% rename from CircularStatistics/R/circtestsmultiplesample.R rename to R/circtestsmultiplesample.R diff --git a/CircularStatistics/R/circtestsonesample.R b/R/circtestsonesample.R similarity index 100% rename from CircularStatistics/R/circtestsonesample.R rename to R/circtestsonesample.R diff --git a/README.md b/README.md index eecaef2..3f9284b 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,16 @@ This is a circular statistics module for JASP. It can be installed additionally ### Prerequisites -An installed JASP version >= 0.10. +An installed JASP version >= 0.11 (it needs to support dynamic modules). ### Installing +The following works for JASP version 0.11. The process may vary for higher versions of JASP because dynamic modules are still beta in JASP version 0.11. -* Download the ``CircularStatistics.jaspMod`` directory to your local file system. +* Download the source ``CircularStatistics.tar.gz`` from the latest release to your local file system. * Open JASP. +* Go to ``Preferences`` -> ``Advanced`` -> Enable ``Developer mode (beta)`` * Click the ``+`` button in the main ribbon and select ``install module``. -* Select the downloaded ``CircularStatistics.jaspMod``. +* Select the downloaded ``CircularStatistics.tar.gz``. That's it! The module and all it's R dependencies will be installed automatically. @@ -50,4 +52,4 @@ This project is licensed under the GNU General Public License v3.0 - see the [LI Special thanks go to the JASP team of the University of Amsterdam who supported this project at any time. The compatibility of this module with the JASP core is due to their refactoring of the JASP design. -The inspiration for this module was given by Philipp Berens and his publication [CircStat: A Matlab Toolbox for Circular Statistics](https://www.jstatsoft.org/article/view/v031i10). \ No newline at end of file +The inspiration for this module was given by Philipp Berens and his publication [CircStat: A Matlab Toolbox for Circular Statistics](https://www.jstatsoft.org/article/view/v031i10). diff --git a/CircularStatistics/inst/description.json b/inst/description.json similarity index 70% rename from CircularStatistics/inst/description.json rename to inst/description.json index a932111..6855a8f 100644 --- a/CircularStatistics/inst/description.json +++ b/inst/description.json @@ -1,24 +1,17 @@ { "moduleDescription" : { - "title" : "Circular Statistics", - "description" : "This module offers basic methods for directional data.", - "version" : "0.1.0", - "author" : "Aaron Bahde, Philipp Berens (Berens Lab, University of Tuebingen)", - "maintainer" : "JASP Team ", - "website" : "jasp-stats.org", + "title" : "CircularStatistics", + "description" : "This module offers basic methods for directional data", + "version" : "1.0", + "author" : "Aaron Bahde, Philipp Berens (University of Tuebingen)", + "maintainer" : "Philipp Berens ", + "website" : "eye-tuebingen.de/berenslab/", "license" : "GPL (>= 2)", "icon" : "analysis-circstats-descriptives.svg" }, "requiredPackages": ["circular", "ggplot2"], - //"requiredPackages" [ - // { - // "package": "circular", - // "version": "0.4-93" - // } - //], - "menu": [ { diff --git a/CircularStatistics/inst/help/circular descriptives.md b/inst/help/circular descriptives.md similarity index 100% rename from CircularStatistics/inst/help/circular descriptives.md rename to inst/help/circular descriptives.md diff --git a/CircularStatistics/inst/help/circular multiple-sample tests.md b/inst/help/circular multiple-sample tests.md similarity index 100% rename from CircularStatistics/inst/help/circular multiple-sample tests.md rename to inst/help/circular multiple-sample tests.md diff --git a/CircularStatistics/inst/help/circular one-sample tests.md b/inst/help/circular one-sample tests.md similarity index 100% rename from CircularStatistics/inst/help/circular one-sample tests.md rename to inst/help/circular one-sample tests.md diff --git a/CircularStatistics/inst/icons/analysis-circstats-descriptives.svg b/inst/icons/analysis-circstats-descriptives.svg similarity index 100% rename from CircularStatistics/inst/icons/analysis-circstats-descriptives.svg rename to inst/icons/analysis-circstats-descriptives.svg diff --git a/CircularStatistics/inst/icons/analysis-circstats-hypothesis-testing.svg b/inst/icons/analysis-circstats-hypothesis-testing.svg similarity index 100% rename from CircularStatistics/inst/icons/analysis-circstats-hypothesis-testing.svg rename to inst/icons/analysis-circstats-hypothesis-testing.svg diff --git a/CircularStatistics/inst/qml/CircularStatisticsDescriptives.qml b/inst/qml/CircularStatisticsDescriptives.qml similarity index 100% rename from CircularStatistics/inst/qml/CircularStatisticsDescriptives.qml rename to inst/qml/CircularStatisticsDescriptives.qml diff --git a/CircularStatistics/inst/qml/CircularStatisticsMultipleSampleTests.qml b/inst/qml/CircularStatisticsMultipleSampleTests.qml similarity index 100% rename from CircularStatistics/inst/qml/CircularStatisticsMultipleSampleTests.qml rename to inst/qml/CircularStatisticsMultipleSampleTests.qml diff --git a/CircularStatistics/inst/qml/CircularStatisticsOneSampleTests.qml b/inst/qml/CircularStatisticsOneSampleTests.qml similarity index 100% rename from CircularStatistics/inst/qml/CircularStatisticsOneSampleTests.qml rename to inst/qml/CircularStatisticsOneSampleTests.qml