Add types in Formula

More Update wrapper in some modules update submodules
jasp-stats · Nov 5, 2024 · e1d6f31 · e1d6f31
1 parent f86cf17
commit e1d6f31
Show file tree

Hide file tree

Showing 61 changed files with 359 additions and 418 deletions.
diff --git a/Engine/jaspBase b/Engine/jaspBase
diff --git a/Engine/jaspGraphs b/Engine/jaspGraphs
diff --git a/Modules/jaspAcceptanceSampling b/Modules/jaspAcceptanceSampling
diff --git a/Modules/jaspAnova b/Modules/jaspAnova
diff --git a/Modules/jaspAudit b/Modules/jaspAudit
diff --git a/Modules/jaspBFF b/Modules/jaspBFF
diff --git a/Modules/jaspBain b/Modules/jaspBain
diff --git a/Modules/jaspBsts b/Modules/jaspBsts
diff --git a/Modules/jaspCircular b/Modules/jaspCircular
diff --git a/Modules/jaspCochrane b/Modules/jaspCochrane
diff --git a/Modules/jaspDescriptives b/Modules/jaspDescriptives
diff --git a/Modules/jaspDistributions b/Modules/jaspDistributions
diff --git a/Modules/jaspEquivalenceTTests b/Modules/jaspEquivalenceTTests
diff --git a/Modules/jaspFactor b/Modules/jaspFactor
diff --git a/Modules/jaspFrequencies b/Modules/jaspFrequencies
diff --git a/Modules/jaspJags b/Modules/jaspJags
diff --git a/Modules/jaspLearnBayes b/Modules/jaspLearnBayes
diff --git a/Modules/jaspLearnStats b/Modules/jaspLearnStats
diff --git a/Modules/jaspMachineLearning b/Modules/jaspMachineLearning
diff --git a/Modules/jaspMetaAnalysis b/Modules/jaspMetaAnalysis
diff --git a/Modules/jaspMixedModels b/Modules/jaspMixedModels
diff --git a/Modules/jaspNetwork b/Modules/jaspNetwork
diff --git a/Modules/jaspPower b/Modules/jaspPower
diff --git a/Modules/jaspPredictiveAnalytics b/Modules/jaspPredictiveAnalytics
diff --git a/Modules/jaspProcess b/Modules/jaspProcess
diff --git a/Modules/jaspProphet b/Modules/jaspProphet
diff --git a/Modules/jaspQualityControl b/Modules/jaspQualityControl
diff --git a/Modules/jaspRegression b/Modules/jaspRegression
diff --git a/Modules/jaspReliability b/Modules/jaspReliability
diff --git a/Modules/jaspRobustTTests b/Modules/jaspRobustTTests
diff --git a/Modules/jaspSem b/Modules/jaspSem
diff --git a/Modules/jaspSummaryStatistics b/Modules/jaspSummaryStatistics
diff --git a/Modules/jaspSurvival b/Modules/jaspSurvival
diff --git a/Modules/jaspTTests b/Modules/jaspTTests
diff --git a/Modules/jaspTimeSeries b/Modules/jaspTimeSeries
diff --git a/Modules/jaspVisualModeling b/Modules/jaspVisualModeling
diff --git a/QMLComponents/analysisform.cpp b/QMLComponents/analysisform.cpp
@@ -310,6 +310,9 @@ QString AnalysisForm::msgsListToString(const QStringList & list) const
 	if(list.length() == 0)
 		return "";
 
+	if (list.size() == 1)
+		return list[0];
+
 	QString text;
 	for (const QString & msg : list)
 		if(msg.size())

diff --git a/QMLComponents/boundcontrols/boundcontrolbase.cpp b/QMLComponents/boundcontrols/boundcontrolbase.cpp
@@ -150,7 +150,7 @@ void BoundControlBase::_readTableValue(const Json::Value &value, const std::stri
 	}
 }
 
-Json::Value BoundControlBase::_getTableValueOption(const Terms& terms, const ListModel::RowControlsValues& componentValuesMap, const std::string& key, bool hasInteraction, bool keyHasVariables)
+Json::Value BoundControlBase::_getTableValueOption(const Terms& terms, const ListModel::RowControlsValues& componentValuesMap, const std::string& key, bool hasInteraction, bool keyHasVariables) const
 {
 	Json::Value result(Json::arrayValue);
 

diff --git a/QMLComponents/boundcontrols/boundcontrolbase.h b/QMLComponents/boundcontrols/boundcontrolbase.h
@@ -48,7 +48,7 @@ class BoundControlBase : public BoundControl
 	std::string					getName()													const;
 	void						handleComputedColumn(const Json::Value& value);
 
-	Json::Value					_getTableValueOption(const Terms& terms, const ListModel::RowControlsValues& componentValuesMap, const std::string& key, bool hasInteraction, bool keyHasVariables);
+	Json::Value					_getTableValueOption(const Terms& terms, const ListModel::RowControlsValues& componentValuesMap, const std::string& key, bool hasInteraction, bool keyHasVariables) const;
 	void						_setTableValue(const Terms& terms, const ListModel::RowControlsValues& componentValuesMap, const std::string& key, bool hasInteraction, bool keyHasVariables = false);
 
 	void						_readTableValue(const Json::Value& value, const std::string& key, bool hasMultipleTerms, Terms& terms, ListModel::RowControlsValues& allControlValues);

diff --git a/QMLComponents/boundcontrols/boundcontrollayers.cpp b/QMLComponents/boundcontrols/boundcontrollayers.cpp
@@ -73,7 +73,7 @@ bool BoundControlLayers::isJsonValid(const Json::Value &optionValue) const
 			{
 				const Json::Value& nameOption = value["name"];
 				const Json::Value& variablesOption = value["variables"];
-				valid = nameOption.type() == Json::stringValue && variablesOption.type() == Json::arrayValue;
+				valid = nameOption.type() == Json::stringValue && (variablesOption.type() == Json::arrayValue || variablesOption.type() == Json::stringValue);
 
 				if (!valid)
 					break;
+ −		inst/po/de/LC_MESSAGES/R-jaspGraphs.mo
+3 −3		po/R-de.po
+24 −24		R/ancovaWrapper.R
+17 −17		R/ancovabayesianWrapper.R
+22 −22		R/anovaWrapper.R
+16 −16		R/anovabayesianWrapper.R
+24 −24		R/anovarepeatedmeasuresWrapper.R
+15 −15		R/anovarepeatedmeasuresbayesianWrapper.R
+6 −6		R/manovaWrapper.R
+ −		inst/po/de/LC_MESSAGES/R-jaspAnova.mo
+4 −6		po/R-de.po
+28 −27		renv.lock
+ −		inst/po/de/LC_MESSAGES/R-jaspBFF.mo
+ −		inst/qml/translations/jaspBFF-de.qm
+ −		inst/qml/translations/jaspBFF-es.qm
+1 −1		po/QML-de.po
+1 −1		po/QML-es.po
+20 −17		po/R-de.po
+20 −19		renv.lock
+3 −1		R/bainCommon.R
+6 −6		R/bainancovabayesianWrapper.R
+5 −5		R/bainanovabayesianWrapper.R
+5 −5		R/bainregressionlinearbayesianWrapper.R
+4 −4		R/bainsembayesianWrapper.R
+5 −5		R/bainttestbayesianindependentsamplesWrapper.R
+4 −4		R/bainttestbayesianonesampleWrapper.R
+1 −1		R/bainttestbayesianpairedsamples.R
+3 −3		R/bainttestbayesianpairedsamplesWrapper.R
+25 −24		renv.lock
+4 −4		R/DescriptivesTimeSeriesWrapper.R
+33 −36		R/commonTimeSeries.R
+41 −12		R/descriptives.R
+12 −10		R/descriptivesWrapper.R
+4 −4		R/flexplotWrapper.R
+15 −19		R/raincloudPlotsWrapper.R
+2 −1		inst/Description.qml
+24 −1		inst/qml/Descriptives.qml
+ −		inst/qml/translations/jaspDescriptives-de.qm
+ −		inst/qml/translations/jaspDescriptives-es.qm
+ −		inst/qml/translations/jaspDescriptives-gl.qm
+1 −1		po/QML-de.po
+1 −1		po/QML-es.po
+1 −1		po/QML-gl.po
+27 −26		renv.lock
+81 −0		tests/testthat/_snaps/DescriptivesTimeSeries/autocorrelation-function.svg
+351 −0		tests/testthat/_snaps/DescriptivesTimeSeries/lag-plot-subplot-1.svg
+81 −0		tests/testthat/_snaps/DescriptivesTimeSeries/partial-autocorrelation-function.svg
+341 −0		tests/testthat/_snaps/DescriptivesTimeSeries/time-series-plot-desc-subplot-1.svg
+85 −0		tests/testthat/_snaps/descriptives/countplot.svg
+49 −0		tests/testthat/test-DescriptivesTimeSeries.R
+16 −0		tests/testthat/test-descriptives.R
+9 −5		R/confirmatoryfactoranalysis.R
+10 −8		R/confirmatoryfactoranalysisWrapper.R
+17 −8		R/exploratoryfactoranalysis.R
+7 −3		R/exploratoryfactoranalysisWrapper.R
+14 −4		R/principalcomponentanalysis.R
+7 −5		R/principalcomponentanalysisWrapper.R
+ −		inst/po/en@quot/LC_MESSAGES/R-jaspFactor.mo
+4 −2		inst/qml/ExploratoryFactorAnalysis.qml
+4 −2		inst/qml/PrincipalComponentAnalysis.qml
+6 −1		po/R-de.po
+11 −3		po/R-es.po
+6 −1		po/R-fr.po
+11 −3		po/R-gl.po
+8 −3		po/R-ja.po
+4 −1		po/R-jaspFactor.pot
+6 −1		po/R-nl.po
+6 −1		po/R-pl.po
+6 −1		po/R-pt.po
+6 −1		po/R-ru.po
+6 −1		po/R-zh_Hans.po
+6 −1		po/R-zh_Hant.po
+25 −24		renv.lock
+6 −6		R/InformedBinomialTestBayesianWrapper.R
+4 −4		R/InformedMultinomialTestBayesianWrapper.R
+6 −6		R/abtestbayesianWrapper.R
+3 −3		R/binomialtestWrapper.R
+3 −3		R/binomialtestbayesianWrapper.R
+5 −5		R/contingencytablesWrapper.R
+5 −5		R/contingencytablesbayesianWrapper.R
+5 −5		R/multinomialtestWrapper.R
+5 −5		R/multinomialtestbayesianWrapper.R
+5 −5		R/regressionloglinearWrapper.R
+5 −5		R/regressionloglinearbayesianWrapper.R
+23 −22		renv.lock
+13 −15		R/LSbinaryclassification.R
+2 −12		R/LSbinomialcommon.R
+20 −33		R/LSbinomialestimation.R
+24 −29		R/LSbinomialtesting.R
+1 −7		R/LSgaussiancommon.R
+1 −0		inst/Description.qml
+22 −21		renv.lock
+60 −60		tests/testthat/_snaps/lsbinomialestimation/models-beta-vol1-3.svg
+50 −50		tests/testthat/_snaps/lsbinomialestimation/models-beta-vol2-1.svg
+60 −60		tests/testthat/_snaps/lsbinomialestimation/models-point-vol1-4.svg
+60 −60		tests/testthat/_snaps/lsbinomialestimation/models-point-vol2-2.svg
+23 −23		tests/testthat/_snaps/lsbinomialestimation/posterior-plot-3-beta-4.svg
+24 −24		tests/testthat/_snaps/lsbinomialestimation/posterior-plot-3-spike-3.svg
+27 −27		tests/testthat/_snaps/lsbinomialestimation/posterior-plot-5-default-5.svg
+16 −16		tests/testthat/_snaps/lsbinomialestimation/prediction-plot-0-vol6-1.svg
+24 −24		tests/testthat/_snaps/lsbinomialestimation/predictions-plot-11-vol1-9.svg
+23 −23		tests/testthat/_snaps/lsbinomialtesting/posterior-plot-1-beta-2.svg
+29 −29		tests/testthat/_snaps/lsbinomialtesting/posterior-plot-1-vol5-2.svg
+26 −26		tests/testthat/_snaps/lsbinomialtesting/posterior-prediction-plot-2-vol5-3.svg
+27 −27		tests/testthat/_snaps/lsbinomialtesting/prior-plot-3-vol5-4.svg
+19 −19		tests/testthat/_snaps/lsbinomialtesting/prior-prediction-plot-3-spike-4.svg
+12 −12		tests/testthat/test-lsbinomialestimation.R
+32 −33		tests/testthat/test-lsbinomialtesting.R
+16 −16		R/MixedModelsBGLMMWrapper.R
+15 −15		R/MixedModelsBLMMWrapper.R
+22 −22		R/MixedModelsGLMMWrapper.R
+13 −13		R/MixedModelsLMMWrapper.R
+24 −23		renv.lock
+ −		inst/po/de/LC_MESSAGES/R-jaspProcess.mo
+ −		inst/qml/translations/jaspProcess-de.qm
+4 −4		po/QML-de.po
+63 −40		po/R-de.po
+24 −23		renv.lock