[Pntool-developers] SF.net SVN: pntool:[209] spnbox/asiph.c

[<Ste...@us...>]

Revision: 209
          http://pntool.svn.sourceforge.net/pntool/?rev=209&view=rev
Author:   StephenCamp
Date:     2009-07-28 16:49:11 +0000 (Tue, 28 Jul 2009)

Log Message:
-----------
asiph now returns result matrices that have been set up for fast column operations.

Modified Paths:
--------------
    spnbox/asiph.c

Modified: spnbox/asiph.c
===================================================================
--- spnbox/asiph.c	2009-07-28 16:38:30 UTC (rev 208)
+++ spnbox/asiph.c	2009-07-28 16:49:11 UTC (rev 209)
@@ -162,7 +162,8 @@
 	}
 	/*The result NMS should be a transpose copy of MNS with columns not flagged
 	in newindex removed. The result MS should be a transpose copy of MNS. Count
-	how many columns that is.*/
+	how many columns that is. Both of the result matrices should be optimized
+	for column operations.*/
 	j = 0;
 	for (i = 0; i < NumberOfRows(data->MNS); i++)
 	{
@@ -170,8 +171,11 @@
 	}
 	
 	asiph_r result;
-	AllocateMatrixType(2, &result.NMS, NumberOfColumns(data->MNS), j);
-	AllocateMatrixType(2, &result.MS, NumberOfColumns(data->MNS), NumberOfRows(data->MNS));
+	AllocateMatrixType(2, &result.NMS, j, NumberOfColumns(data->MNS));
+	AllocateMatrixType(2, &result.MS, NumberOfRows(data->MNS), NumberOfColumns(data->MNS));
+	TransposeMatrix(&result.NMS);
+	TransposeMatrix(&result.MS);
+	
 	TransposeMatrix(&data->MNS);
 	CopyMatrix(&data->MNS, &result.MS);
 	j = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.