Merge branch 'development'

Author: boutinb

.gitignore

@@ -45,3 +45,5 @@ Resources/TestFiles
 *.autosave
 JASP-Engine/JASP/R/.Rhistory
 JASP-Tests/.Rhistory
+
+flatpak-builder-folder/

.travis.yml

@@ -1,5 +1,5 @@
 language: r
-r: "3.3"
+r: "3.4.3"
 cache: packages
 
 matrix:
@@ -11,15 +11,11 @@ matrix:
         "sudo add-apt-repository \"deb http://archive.ubuntu.com/ubuntu/ xenial main\" -y",
         "sudo apt-get update -q",
         "echo 'Installing R package dependencies'",
-        "sudo apt-get install libfreetype6=2.6.1-0.1ubuntu2",
-        "sudo apt-get install libfreetype6-dev=2.6.1-0.1ubuntu2",
         "sudo apt-get install libnlopt-dev",
         "sudo apt-get install r-cran-rcppeigen",
         "sudo apt-get install r-cran-plogr"
       ]
-      install: Rscript -e 'install.packages(c("testthat", "vdiffr"))'
+      install: Rscript Tools/requiredPackages.R JASP-Engine/JASP/R true true
       script:
-        - Rscript Tools/requiredPackages.R JASP-Engine/JASP/R true
-        - Rscript Tools/showVersion.R
         - cd JASP-Tests/R/tests/
-        - R < testthat.R --no-save
+        - R < testthat.R --no-save

CONTRIBUTING.md

@@ -1,7 +1,11 @@
-# Contributing to jasp
+# Requesting new features, or reporting bugs:
 
-Anyone is welcome to contribute to JASP. If you would like to create a new module/analysis, fix a
-bug you found, or implemented a feature, please submit a pull request. See
+To request a new feature, or report a bug, please consult the following [blog post](https://jasp-stats.org/2018/03/29/request-feature-report-bug-jasp/)
+
+# Contributing to JASP
+
+Anyone is welcome to contribute to JASP. If you have created a new module/analysis, fixed a
+bug you found, or implemented a feature on your own branch, please submit a pull request. See
 [Dev Docs](Docs/development) for more details about the development.
 
 ## Pull request process

Docs/development/jasp-building-guide.md

@@ -32,9 +32,9 @@ Windows
 
 Building JASP under windows is the most temperamental, and the versions listed here are known to work; slight variations on these numbers probably won't work.
 
- - [R 3.3.3 win64](https://static.jasp-stats.org/development/R3.3%20Win%20JASP%200.8.6.zip)
+ - [R 3.4.4 win64](https://static.jasp-stats.org/development/R3.4%20Win%20JASP%200.9.1.zip)
  - [boost 1.64.0](https://static.jasp-stats.org/development/boost_1_64_0.zip)
- - [boost 1.64.0 binaries, libarchive binaries](https://static.jasp-stats.org/development/Build-Binaries-Windows-64-qt510.zip)
+ - [boost 1.64.0 binaries, libarchive binaries](https://static.jasp-stats.org/development/Build-Binaries-Windows-64-qt510.zip) Update 14-08-2018 (incl. JASP-R-Interface-3.1).
  - [Visual Studio 2017] (https://www.visualstudio.com/downloads/) Download community version
 
 Qt: JASP for windows is built as 64-bit and is built with Visual Studio 2017.
@@ -70,33 +70,33 @@ To build JASP on mac you need to clone the JASP repository and download the foll
  0. Clone the JASP repository
  1. [XCode](https://developer.apple.com/xcode/) Easiest would be via the App Store.
  2. [Qt 5.10.1 + QtWebEngine](https://download.qt.io/archive/qt/). Tick: MacOS and Qt WebEngine
- 3. [R 3.3.3](https://static.jasp-stats.org/development/R3.3%20OSX%20JASP%200.8.6.zip) This contains R and the packages. Unzip this file and set it as a framework in the build folder as shown below.
+ 3. [R 3.4.4](https://static.jasp-stats.org/development/R3.4%20OSX%20JASP%200.9.1.zip) This contains R and the packages. Unzip this file and set it as a framework in the build folder as shown below.
  4. [boost 1.64.0](https://static.jasp-stats.org/development/boost_1_64_0.zip). Unzip this file in the JASP folder.
  5. [boost 1.64.0 binaries, libarchive binaries](https://static.jasp-stats.org/development/Build-Binaries-OSX-64-qt510.zip). Unzip this file in both release and debug build folders.
 
 The directory structure should be as follows:
 
-    [+] JASP
-    	[-] jasp-desktop  < from github >
-    	[-] buildDebug510 < Build debug directory for QtCreator >
-    		- libboost_system-clang-mt-1_64.a
-		- libboost_filesystem-clang-mt-1_64.a
-		- libarchive.a
-		- libz.a
-		- libJASP-R-Interface.1.0.0.dylib
-		- libJASP-R-Interface.dylib
-	[-] buildRelease510 < Build release directory for QtCreator  >
-		- libboost_system-clang-mt-1_64.a
-		- libboost_filesystem-clang-mt-1_64.a
-		- libarchive.a
-		- libz.a
-		- libJASP-R-Interface.1.0.0.dylib
-		- libJASP-R-Interface.dylib
-    	[-] boost_1_64_0
-	[-] Frameworks
-		[-] R.framework
-			[-] Versions
-				[+] 3.3
+	[+] JASP
+		[-] jasp-desktop  < from github >
+		[-] buildDebug510 < Build debug directory for QtCreator >
+			- libboost_system-clang-mt-1_64.a
+			- libboost_filesystem-clang-mt-1_64.a
+			- libarchive.a
+			- libz.a
+			- libJASP-R-Interface.1.0.0.dylib
+			- libJASP-R-Interface.dylib
+		[-] buildRelease510 < Build release directory for QtCreator  >
+			- libboost_system-clang-mt-1_64.a
+			- libboost_filesystem-clang-mt-1_64.a
+			- libarchive.a
+			- libz.a
+			- libJASP-R-Interface.1.0.0.dylib
+			- libJASP-R-Interface.dylib
+		[-] boost_1_64_0
+		[-] Frameworks
+                        [-] R.framework
+				[-] Versions
+					[+] 3.3
 
  0. **Clone** the JASP repository into a folder of your choice. Our default choice is *~/desktop/JASP/* and cloning results in the creating of *~/desktop/JASP/jasp-desktop*.
  1. **XCode**: Qt on OS X relies on XCode to function, you can install this through the App Store. It's easiest if you install this, run it, accept the license agreement, and then close it down before installing Qt.

Docs/user-guide/index.md

@@ -34,10 +34,25 @@ From then on, you will be able to start JASP in the usual way.
 
 #### Linux
 
+#### 1. Flatpak
+JASP is now available for virtually all Linux distributions through the widely available flatpak. This is most likely already installed on your distribution and otherwise can be  easily acquired through your package manager. After you have installed flatpak enter the following command into a terminal:
+```
+flatpak install http://static.jasp-stats.org/flatpak/JASP.flatpakref
+```
+It might not be automatically added to the application menu in some cases (ubuntu for instance) and there you can start JASP by running:
+```
+flatpak run org.jasp.JASP
+```
+After you have installed JASP from flatpak any new releases/updates can be installed by running:
+```
+flatpak update
+```
+
+#### 2. PPA
 JASP is available for the following Linux versions:
 
+ - Ubuntu Artful (17.10)
  - Ubuntu Xenial (16.04 LTS)
- - Ubuntu Wily (15.10)
  - Arch Linux
 
 For other verions, JASP can be built from the source. The debian folder is located in the github repository –  https://github.com/jasp-stats/jasp-desktop/tree/development/Tools/debian

JASP-Common/JASP-Common.pro

@@ -7,6 +7,8 @@ TARGET = JASP-Common
 TEMPLATE = lib
 CONFIG += staticlib
 CONFIG += c++11
+ 
+include(../JASP.pri)
 
    macx:INCLUDEPATH += ../../boost_1_64_0
 windows:INCLUDEPATH += ../../boost_1_64_0
@@ -62,7 +64,11 @@ SOURCES += \
 	sharedmemory.cpp \
 	tempfiles.cpp \
 	utils.cpp \
-	version.cpp
+	version.cpp \
+    computedcolumn.cpp \
+    computedcolumns.cpp \
+    enginedefinitions.cpp \
+    options/optioncomputedcolumn.cpp
 
 HEADERS += \
 	analysis.h \
@@ -118,11 +124,15 @@ HEADERS += \
 	utils.h \
 	version.h \
     options/optionvariablei.h \
-    jsonredirect.h
+    jsonredirect.h \
+    computedcolumn.h \
+    computedcolumns.h \
+    enginedefinitions.h \
+    options/optioncomputedcolumn.h
 
 #exists(/app/lib/*) should only be true when building flatpak
-macx | windows | exists(/app/lib/*) {
-	DEFINES += JASP_LIBJSON_STATIC
+#macx | windows | exists(/app/lib/*)
+contains(DEFINES, JASP_LIBJSON_STATIC) {
 
     SOURCES += \
             lib_json/json_internalarray.inl \
@@ -142,9 +152,5 @@ macx | windows | exists(/app/lib/*) {
             lib_json/reader.h \
             lib_json/value.h \
             lib_json/writer.h
-} else {
-	linux: LIBS += -ljsoncpp
-	CONFIG(debug, debug|release) {  DEFINES+=JASP_DEBUG }
 }
 
-