Merged 'master' with Mushir's work'

1 files changed, 0 insertions, 93 deletions

diff --git a/src/c/statisticsFunctions/max/testFloatMax.c~ b/src/c/statisticsFunctions/max/testFloatMax.c~
deleted file mode 100644
index cb572f7..0000000
--- a/src/c/statisticsFunctions/max/testFloatMax.c~
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - INRIA - Arnaud Torset
- *
- *  This file must be used under the terms of the CeCILL.
- *  This source file is licensed as described in the file COPYING, which
- *  you should have received as part of this distribution.  The terms
- *  are also available at
- *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-
-
-#include "statMax.h"
-//#include "max.h"
-#include "assert.h"
-#include "stdio.h"
-
-static void smaxaTest(void){
-	float in[12]={4,5,7,1,2,6,4,1,2,5,4,3};
-	float out;
-	
-	out = smaxa(in,12);
-	assert(out-7==0);
-	
-}
-
-
-static void srowmaxaTest(void){
-	float in[12]={4,5,7,1,2,6,4,1,2,5,4,3};
-	float out1[1],out2[2],out3[3],out4[4],out6[6],out12[12];
-	float result2[2]={7,5};
-	float result3[3]={7,6,5};
-	float result4[4]={7,6,4,5};
-	float result6[6]={5,7,6,4,5,4};
-	int i;
-	
-	
-	srowmaxa(in,12,1,out1);
-	srowmaxa(in,6,2,out2);
-	srowmaxa(in,4,3,out3);
-	srowmaxa(in,3,4,out4);
-	srowmaxa(in,2,6,out6);
-	srowmaxa(in,1,12,out12);
-	
-	assert(out1[0]-7==0);
-	for (i=0;i<2;i++) 	assert(out2[i]-result2[i]==0);
-	for (i=0;i<3;i++) 	assert(out3[i]-result3[i]==0);
-	for (i=0;i<4;i++) 	assert(out4[i]-result4[i]==0);
-	for (i=0;i<6;i++) 	assert(out6[i]-result6[i]==0);
-	for (i=0;i<12;i++) 	assert(out12[i]-in[i]==0);
-}
-
-
-static void scolumnmaxaTest(void){
-	float in[12]={4,5,7,1,2,6,4,1,2,5,4,3};
-	float out1[1],out2[2],out3[3],out4[4],out6[6],out12[12];
-	float result2[2]={7,6};
-	float result3[3]={5,5,7};
-	float result4[4]={4,6,7,3};
-	float result6[6]={4,5,7,5,4,6};
-	int i;
-	
-	
-	
-	scolumnmaxa(in,12,1,out12);
-	scolumnmaxa(in,6,2,out6);
-	scolumnmaxa(in,4,3,out4);
-	scolumnmaxa(in,3,4,out3);
-	scolumnmaxa(in,2,6,out2);
-	scolumnmaxa(in,1,12,out1);
-	
-	assert(out1[0]-7==0);
-	for (i=0;i<2;i++) 	assert(out2[i]-result2[i]==0);
-	for (i=0;i<3;i++) 	assert(out3[i]-result3[i]==0);
-	for (i=0;i<4;i++) 	assert(out4[i]-result4[i]==0);
-	for (i=0;i<6;i++) 	assert(out6[i]-result6[i]==0);
-	for (i=0;i<12;i++) 	assert(out12[i]-in[i]==0);
-}
-
-static int maxTest(void){
-	smaxaTest();
-	srowmaxaTest();
-	scolumnmaxaTest();
-	return 0;
-}
-
-
-int main(void){
-	assert(maxTest()==0);
-	return 0;
-}