# HG changeset patch
# User Merten Sach <msach@mailbox.tu-berlin.de>
# Date 1316196907 -7200
# Node ID 2e828529093769c599b11a631c7407b4632e0d58
# Parent  e27175b02fd37bd951071f3dbb0d6587e4dfee36# Parent  f8d3f16e70c89c2e8b005de3c0feddddd405d625
merging wrong commit

diff -r e27175b02fd3 -r 2e8285290937 src/Application/VPThread__Matrix_Mult/Divide_Pr.c
--- a/src/Application/VPThread__Matrix_Mult/Divide_Pr.c	Tue Jul 26 16:34:48 2011 +0200
+++ b/src/Application/VPThread__Matrix_Mult/Divide_Pr.c	Fri Sep 16 20:15:07 2011 +0200
@@ -56,6 +56,17 @@
             SlicingStrucCarrier *slicingStrucCarrier,
             VirtProcr *resultPr, VirtProcr *animatingPr );
 
+void inline
+copyTranspose( int32 numRows, int32 numCols,
+               int32 origStartRow, int32 origStartCol, int32 origStride,
+               float32 *subArray, float32 *origArray );
+
+void inline
+multiplyMatrixArraysTransposed( int32 vecLength, int32 numResRows,
+                                int32 numResCols,
+                                float32 *leftArray, float32 *rightArray,
+                                float32 *resArray );
+
 
 
 /*Divider creates one processor for every sub-matrix
diff -r e27175b02fd3 -r 2e8285290937 src/Application/VPThread__Matrix_Mult/subMatrix_Pr.c
--- a/src/Application/VPThread__Matrix_Mult/subMatrix_Pr.c	Tue Jul 26 16:34:48 2011 +0200
+++ b/src/Application/VPThread__Matrix_Mult/subMatrix_Pr.c	Fri Sep 16 20:15:07 2011 +0200
@@ -10,7 +10,8 @@
 
 #include "VPThread__Matrix_Mult.h"
 
-
+//Declarations
+//===================================================
 
 void inline
 copyFromOrig( SubMatrix *subMatrix, VirtProcr *animPr );
@@ -31,6 +32,7 @@
                       float32 *leftArray, float32 *rightArray,
                       float32 *resArray );
 
+//===================================================
 
 /*A  processor is created with an environment that holds two matrices,
  * the row and col that it owns, and the name of a result gathering
diff -r e27175b02fd3 -r 2e8285290937 src/Application/main.c
--- a/src/Application/main.c	Tue Jul 26 16:34:48 2011 +0200
+++ b/src/Application/main.c	Fri Sep 16 20:15:07 2011 +0200
@@ -16,7 +16,7 @@
 
 void printParams(ParamBag *paramBag)
 {
-    snprintf(&__DataSet, 255,
+    snprintf((char*)&__DataSet, 255,
                 "#\tLeft Matrix %d x %d,\n#\tRight Matrix %d x %d",
                 getParamFromBag("leftMatrixRows", paramBag)->intValue,
                 getParamFromBag("leftMatrixCols", paramBag)->intValue,