recipe 16.12 now uses asMatrix()

Author: bhaller

QtSLiM/recipes/Recipe 16.12 - Forcing a specific pedigree in a nonWF model II.txt

@@ -1,12 +1,12 @@
 // Keywords: nonWF, non-Wright-Fisher
 
-function (i)readIntTable(s$ path)
+function (+)readMatrix(s$ path, [string$ sep = ","])
 {
 	if (!fileExists(path))
-		stop("readIntTable(): File not found at path " + path);
-	l = readFile(path);
-	m = sapply(l, "asInteger(strsplit(applyValue));", simplify="matrix");
-	return t(m);
+		stop("readMatrix(): File not found at path " + path);
+	df = readCSV(path, colNames=F, sep=sep);
+	m = df.asMatrix();
+	return m;
 }
 
 initialize() {
@@ -21,8 +21,8 @@ initialize() {
 	initializeRecombinationRate(1e-8);
 
 	// read in the pedigree log files
-	defineConstant("M", readIntTable("mating.txt"));
-	defineConstant("D", readIntTable("death.txt"));
+	defineConstant("M", readMatrix("mating.txt", sep=""));
+	defineConstant("D", readMatrix("death.txt", sep=""));
 
 	// extract the ticks for quick lookup
 	defineConstant("Mt", drop(M[,0]));

SLiMgui/Recipes/Recipe 16.12 - Forcing a specific pedigree in a nonWF model II.txt

@@ -1,12 +1,12 @@
 // Keywords: nonWF, non-Wright-Fisher
 
-function (i)readIntTable(s$ path)
+function (+)readMatrix(s$ path, [string$ sep = ","])
 {
 	if (!fileExists(path))
-		stop("readIntTable(): File not found at path " + path);
-	l = readFile(path);
-	m = sapply(l, "asInteger(strsplit(applyValue));", simplify="matrix");
-	return t(m);
+		stop("readMatrix(): File not found at path " + path);
+	df = readCSV(path, colNames=F, sep=sep);
+	m = df.asMatrix();
+	return m;
 }
 
 initialize() {
@@ -21,8 +21,8 @@ initialize() {
 	initializeRecombinationRate(1e-8);
 
 	// read in the pedigree log files
-	defineConstant("M", readIntTable("mating.txt"));
-	defineConstant("D", readIntTable("death.txt"));
+	defineConstant("M", readMatrix("mating.txt", sep=""));
+	defineConstant("D", readMatrix("death.txt", sep=""));
 
 	// extract the ticks for quick lookup
 	defineConstant("Mt", drop(M[,0]));

VERSIONS

@@ -19,6 +19,7 @@ development head (in the master branch):
 	the color property on Individual no longer guarantees that the value read equals the value set; when a color is set, it is now converted to RGB, so named colors do not round-trip
 	add a meanParentAge property, to make calculating generation length simpler; unavailable in WF models (like age), 0 for parentless individuals
 	add DataFrame asMatrix() method to convert a DataFrame into a matrix, if all columns are the same type/class
+	modify recipe 16.12 II to use asMatrix() to read the mating and death files more elegantly
 
 
 version 4.0 (Eidos version 3.0):

eidos/eidos_class_DataFrame.cpp

@@ -367,11 +367,11 @@ EidosValue_SP EidosDataFrame::ExecuteInstanceMethod(EidosGlobalStringID p_method
 	}
 }
 
-//	*********************	- (void)asMatrix()
+//	*********************	- (void)asMatrix(void)
 //
 EidosValue_SP EidosDataFrame::ExecuteMethod_asMatrix(EidosGlobalStringID p_method_id, const std::vector<EidosValue_SP> &p_arguments, EidosInterpreter &p_interpreter)
 {
-#pragma unused (p_method_id, p_interpreter)
+#pragma unused (p_method_id, p_arguments, p_interpreter)
 	// First determine what type the matrix would be, and check that all columns match that type
 	int64_t nrow = RowCount();
 	const EidosDictionaryHashTable *symbols = DictionarySymbols();