make computed columns behave with filters

Author: JorisGoosen

CommonData/column.cpp

@@ -568,7 +568,7 @@ columnType Column::setValues(size_t rows, const std::function<std::string(size_t
 	{
 		const std::string	value = valueLookup(i),
 							label = labelLookup(i);
-
+		
 		if(setValue(i, value, label, false, useLocale) && aChange)
 			(*aChange) = true;
 
@@ -634,28 +634,17 @@ bool Column::overwriteDataAndType(stringvec colData, columnType colType)
 {
 	JASPTIMER_SCOPE(Column::overwriteDataAndType);
 
-	if(computeFilter() != "")
-	{
-		Filter  theFilter(data(), computeFilter(), false);
-		
-		const boolvec & filtered = theFilter.filtered();
-		stringvec		newData;
-						newData	 . reserve(filtered.size());
-		
-		for(size_t iFilter=0, iData=0; iFilter < filtered.size() && iData < colData.size(); iFilter++)
-			newData.push_back(filtered[iFilter] ? colData[iData++] : "");
-				
-		colData = newData;
-	}
-	else if(colData.size() == data()->shownFilter()->filteredRowCount())
-	{
-		const boolvec & filtered = data()->shownFilter()->filtered();
-		stringvec		newData;
-						newData	 . reserve(filtered.size());
-						
-		
-		colData = newData;
-	}
+	assert(data()->shownFilter()->name() == computeFilter());
+	
+	const boolvec & filtered = data()->shownFilter()->filtered();
+	stringvec		newData;
+					newData	 . reserve(filtered.size());
+					
+	for(size_t iFilter=0, iData=0; iFilter < filtered.size() && iData < colData.size(); iFilter++)
+		newData.push_back(filtered[iFilter] ? colData[iData++] : "");
+					
+	colData = newData;
+	
 
 	//Now to make sure that the colData is neither bigger nor smaller than the dataset:
 	colData.resize(data()->rowCount()); //Either add blanks rows add end or drop superfluous data
@@ -1326,7 +1315,7 @@ doublevec Column::dataAsRDoubles(const boolvec &filter) const
 		if(!useFilter || filter[row])
 		{
 			Label * l = labelByRow(row);
-			doubles.push_back(!l->isEmptyValue() ? l->originalValueAsDouble() : EmptyValues::missingValueDouble);
+			doubles.push_back(l && !l->isEmptyValue() ? l->originalValueAsDouble() : EmptyValues::missingValueDouble);
 		}
 
 	return doubles;
@@ -1525,7 +1514,7 @@ bool Column::setStringValue(size_t row, const std::string & userEntered, const s
 
 		if(label && label->isEmptyValue())	return false;
 		if (cur == "")						return false;
-		else								return setValue(row, EmptyValues::missingValueDouble, writeToDB);
+		else								return setValue(row, EmptyValues::missingValueInteger, writeToDB);
 	}
 
 	double		newDoubleToSet	= EmptyValues::missingValueDouble;
@@ -1556,7 +1545,7 @@ bool Column::setValue(size_t row, std::string value, const std::string & label,
 	//if both are "" we just want to clear the cell
 	//the assumption is that this is not direct user-input, but internal jasp stuff.
 	if(value == "" && label == "")
-		return setValue(row, EmptyValues::missingValueDouble, writeToDB);
+		return setValue(row, EmptyValues::missingValueInteger, writeToDB);
 
 	double	newDoubleToSet	= EmptyValues::missingValueDouble;
 	bool	itsADouble		= ColumnUtils::getDoubleValue(value, newDoubleToSet, useLocale);
@@ -1569,7 +1558,6 @@ bool Column::setValue(size_t row, std::string value, const std::string & label,
 
 	Label	* newLabel		= justAValue ? labelByValue(value) : labelByValueAndDisplay(value, label);
 
-
 	if(!newLabel)
 		newLabel = labelByIntsId(labelsAdd((justAValue || labelIsValue) ? value : label, "", itsADouble ? Json::Value(newDoubleToSet) : value));
 
@@ -2359,7 +2347,7 @@ stringvec Column::previewTransform(columnType transformType)
 
 bool Column::initFromLookups(const std::string & newName, size_t rows, const std::function<std::string(size_t)> valueLookup, const std::function<std::string(size_t)> labelLookup, const std::string & title, columnType desiredType, const stringset & emptyValues, int threshold, bool orderLabelsByValue, bool leaveBatchedUnfinished)
 
-{
+{	
 									setHasCustomEmptyValues(emptyValues.size());
 									setCustomEmptyValues(emptyValues);
 									setName(newName);

CommonData/dataset.cpp

@@ -105,7 +105,6 @@ void DataSet::registerFilter(Filter *f)
 	emit filtersCountChanged();
 }
 
-
 void DataSet::dbDelete()
 {
 	JASPTIMER_SCOPE(DataSet::dbDelete);

CommonData/filter.cpp

@@ -16,6 +16,7 @@ Filter::Filter(DataSet * data)
   _constructorJson(		DEFAULT_FILTER_JSON),
   _generatedFilter(		DEFAULT_FILTER_GEN)
 { 
+	assert(_data);
 	connectionCreation();
 
 	_rFilter			= fq(defaultRFilter());
@@ -26,6 +27,7 @@ Filter::Filter(DataSet * data, const std::string & name, bool createIfMissing)
 	: DataSetBaseNode(dataSetBaseNodeType::filter), _data(data), _name(name)
 {
 	assert(_name != "");
+	assert(_data);
 
 	_rFilter			= fq(defaultRFilter()); //Might get overwritten, that is fine
 
@@ -46,7 +48,7 @@ void Filter::connectionCreation()
 
 	_data->registerFilter(this);
 
-	if(_data->defaultFilter() != this)
+	if(_data->defaultFilter() != this && _data->defaultFilter()) //If it doesnt exist yet this is probably it
 		connect(_data->defaultFilter(), &Filter::generatedFilterChanged,	this, &Filter::generatedFilterChanged);
 }