Ensure consistent ordering of edge types in subsample analysis table

Author: macovskym

reconstruction/analyze_subsample_results.py

@@ -130,7 +130,7 @@ def getArgs():
 			CsvWriter.Property("Measurable 2", "medians", "measurable2"),
 			CsvWriter.Property("Cell Type 1", "medians", "cellType1"),
 			CsvWriter.Property("Cell Type 2", "medians", "cellType2"),
-			CsvWriter.PropertiesFormatted("Edge Type", "medians", "{}<==>{}", ["cellType1", "cellType2"]),
+			CsvWriter.PropertiesFormatted("Edge Type", "medians", "{}<==>{}", ["cellType1", "cellType2"], order=True),
 			*dataColumns
 		)
 	else:

reconstruction/util/CsvWriter.py

@@ -72,18 +72,21 @@ def getDataKeys(self):
 		return [self.dataKey]
 
 class PropertiesFormatted(ColumnSpec):
-	def __init__(self, title, dataKey, formatStr, propertyDims, **kwargs):
+	def __init__(self, title, dataKey, formatStr, propertyDims, order=False, **kwargs):
 		super().__init__(**kwargs)
 		self.title = title
 		self.dataKey = dataKey
 		self.formatStr = formatStr
 		self.propertyDims = propertyDims
+		self.order = order
 
 	def getHeaders(self, data):
 		return [self.title]
 
 	def _getValues(self, data, dim, coords, dataArr):
 		properties = numpy.array([dataArr.sel({dim: coords}).coords[propertyDim].data for propertyDim in self.propertyDims]).T
+		if self.order:
+			properties.sort(axis=1)
 		return [[self.formatStr.format(*propertyList) for propertyList in properties]]
 
 	def getDataKeys(self):