Fixes audit sampling filtereddataentry getting stuck

JorisGoosen · boutinb · commit 9f2ded35ad14 · 2024-01-05T11:37:23.000+01:00
fixes jasp-stats/jasp-issues#2503
diff --git a/Desktop/data/computedcolumnsmodel.cpp b/Desktop/data/computedcolumnsmodel.cpp
@@ -271,8 +271,8 @@ void ComputedColumnsModel::checkForDependentAnalyses(const std::string & columnN
 			stringset	usedCols	= analysis->usedVariables(),
 						createdCols = analysis->createdVariables();
 
-			//Dont create an infinite loop please
-			if(usedCols.count(columnName) && !createdCols.count(columnName))
+			//Dont create an infinite loop please, but do this only for non-computed columns created by an analysis (aka distributions, because otherwise it breaks things like planning from audit)
+			if(usedCols.count(columnName) && (!createdCols.count(columnName) || !DataSetPackage::pkg()->isColumnAnalysisNotComputed(columnName)))
 			{
 				bool allColsValidated = true;
 

Original file line number	Diff line number	Diff line change
`@@ -271,8 +271,8 @@ void ComputedColumnsModel::checkForDependentAnalyses(const std::string & columnN`
`271`	`271`	`stringset usedCols = analysis->usedVariables(),`
`272`	`272`	`createdCols = analysis->createdVariables();`
`273`	`273`
`274`		`- //Dont create an infinite loop please`
`275`		`- if(usedCols.count(columnName) && !createdCols.count(columnName))`
	`274`	`+ //Dont create an infinite loop please, but do this only for non-computed columns created by an analysis (aka distributions, because otherwise it breaks things like planning from audit)`
	`275`	`+ if(usedCols.count(columnName) && (!createdCols.count(columnName) \|\| !DataSetPackage::pkg()->isColumnAnalysisNotComputed(columnName)))`
`276`	`276`	`{`
`277`	`277`	`bool allColsValidated = true;`
`278`	`278`