From 8e235230a4c16a042d2620fa7b58a9b0f4ba1914 Mon Sep 17 00:00:00 2001
From: ukashanoor
Date: Mon, 19 Jun 2017 10:42:03 +0530
Subject: after if and for

---
 src/c/signalProcessing/transforms/dct/cdcta.c | 177 ++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 src/c/signalProcessing/transforms/dct/cdcta.c

(limited to 'src/c/signalProcessing/transforms/dct/cdcta.c')

diff --git a/src/c/signalProcessing/transforms/dct/cdcta.c b/src/c/signalProcessing/transforms/dct/cdcta.c
new file mode 100644
index 00000000..5bc27929
--- /dev/null
+++ b/src/c/signalProcessing/transforms/dct/cdcta.c
@@ -0,0 +1,177 @@
+/* Copyright (C) 2016 - IIT Bombay - FOSSEE
+
+ 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
+ Author: Ukasha Noor
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+
+#include "dct.h"
+#include "addition.h"
+#include "types.h"
+#include "floatComplex.h" 
+/*#include "matrixMultiplication"*/
+/*#include <fftw3.h>*/
+#include <math.h>
+
+void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out)
+{
+	int i,j,k,u,v;
+	int n;
+	int x,y;
+	float res,ress;
+	float re,z,q,m;
+	floatComplex accu = DoubleComplex(0, 0);
+	floatComplex temp,mm;
+	if(sign==-1)
+	{
+		if(row==1)
+		{
+			n=col;
+			for(u=0;u<row;u++)
+			{
+				for(v=0;v<col;v++)
+				{
+					x=v*row+u;
+					out[x]=FloatComplex(0,0);
+					for(i=0;i<row;i++)
+					{
+						for(j=0;j<col;j++)
+						{
+							y=row*j+i;		
+							temp=in[y]*(cos(((M_PI)*(y+1-1./2.)*(x))/n));
+							out[x]=cadds(out[x],temp);
+						}
+					}
+					if(x==0)
+					out[x]*=1./(sqrt(n));
+					else
+					{
+						float res=2./n;
+						out[x]*=sqrt(res);
+					}
+				}
+			}
+		}
+		else
+		{	
+			n=col*row;
+			for(u=0;u<row;u++)
+			{
+				for(v=0;v<col;v++)
+				{
+					x=v*row+u;
+					out[x]=FloatComplex(0,0);
+					for(i=0;i<row;i++)
+					{
+						temp=FloatComplex(0,0);
+						mm=FloatComplex(0,0);
+						for(j=0;j<col;j++)
+						{
+							y=j*row+i;
+							z=(float)(((float)j+1.0/2.0)*(float)v);
+							q=(float)(M_PI/(float)col);
+							mm=in[y]*(cos(q*z));	
+							temp=cadds(temp,mm);
+						}
+						z=(float)(((float)i+1.0/2.0)*(float)u);
+						q=(float)(M_PI/(float)row);
+						temp*=cos(q*z);
+						out[x]=cadds(out[x],temp);
+						}
+					if(u==0)
+					{
+						out[x]*=1./sqrt((float)row);
+						if(v==0)
+						out[x]*=1./sqrt((float)col);
+						else
+						out[x]*=sqrt(2./col);
+					}
+					else
+					{
+						out[x]*=sqrt(2./row);
+						if(v==0)
+						out[x]*=1./sqrt((float)col);
+						else
+						out[x]*=sqrt(2./col);
+					}
+				}
+			}
+		}
+	}
+	else if(sign==1)
+	{
+		n=col;
+		if(row==1)
+		{
+			res=1./sqrt(n);
+			ress=sqrt(2./n);
+			for(u=0;u<row;u++)
+			{
+				for(v=0;v<col;v++)
+				{
+					x=v*row+u;
+					out[x]=FloatComplex(0,0);
+					for(i=0;i<row;i++)
+					{
+						for(j=0;j<col;j++)
+						{
+							y=row*j+i;		
+							if(y==0)
+							{
+								q=res*(cos(((M_PI)*(j)*(v+1./2.))/n));
+								out[x]=cadds(out[x],in[y]*q);
+							}
+							else
+							{
+								q=ress*(cos(((M_PI)*(j)*(v+1./2.))/n));
+								out[x]=cadds(out[x],in[y]*q);
+							}
+						}
+					}
+				}
+					
+			}
+		}	
+		else	
+		{
+			for(u=0;u<row;u++)
+			{
+				for(v=0;v<col;v++)
+				{
+					x=v*row+u;
+					out[x]=FloatComplex(0,0);
+					for(i=0;i<row;i++)
+					{
+						re=0;
+						mm=FloatComplex(0,0);
+						temp=FloatComplex(0,0);
+						for(j=0;j<col;j++)
+						{
+							y=row*j+i;
+							mm=in[j*row+i];
+							z=(float)(((float)v+1.0/2.0)*(float)j);
+							q=(float)(M_PI/(float)col);	
+							mm=mm*(cos(q*z));
+							if(j==0)
+							temp=cadds(temp,mm*(1./sqrt((float)col)));
+							else
+							temp=cadds(temp,mm*sqrt(2./col));
+						}
+						z=(float)(((float)u+1.0/2.0)*(float)i);
+						q=(float)(M_PI/(float)row);	
+						if(i==0)
+						out[x]=cadds(out[x],temp*((cos(z*q))*(1./sqrt(row))));
+						else
+						out[x]=cadds(out[x],temp*((cos(z*q))*sqrt(2./row)));
+					}
+				}
+			}
+		}					
+	}
+}
-- 
cgit 


From 9c98503cadef71c7d916f30801c18661e9c3292f Mon Sep 17 00:00:00 2001
From: ukashanoor
Date: Tue, 4 Jul 2017 11:55:14 +0530
Subject: after debugging 1

---
 src/c/signalProcessing/transforms/dct/cdcta.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/c/signalProcessing/transforms/dct/cdcta.c')

diff --git a/src/c/signalProcessing/transforms/dct/cdcta.c b/src/c/signalProcessing/transforms/dct/cdcta.c
index 5bc27929..bd15e5b9 100644
--- a/src/c/signalProcessing/transforms/dct/cdcta.c
+++ b/src/c/signalProcessing/transforms/dct/cdcta.c
@@ -26,7 +26,7 @@ void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out)
 	int x,y;
 	float res,ress;
 	float re,z,q,m;
-	floatComplex accu = DoubleComplex(0, 0);
+	floatComplex accu = FloatComplex(0, 0);
 	floatComplex temp,mm;
 	if(sign==-1)
 	{
-- 
cgit 


From cc9b8a9e45af12106656055b0958fa6d10d93916 Mon Sep 17 00:00:00 2001
From: ukashanoor
Date: Tue, 4 Jul 2017 16:17:19 +0530
Subject: after debugging 2

---
 src/c/signalProcessing/transforms/dct/cdcta.c | 97 +++++++++++++++++++++------
 1 file changed, 75 insertions(+), 22 deletions(-)

(limited to 'src/c/signalProcessing/transforms/dct/cdcta.c')

diff --git a/src/c/signalProcessing/transforms/dct/cdcta.c b/src/c/signalProcessing/transforms/dct/cdcta.c
index bd15e5b9..7ff83645 100644
--- a/src/c/signalProcessing/transforms/dct/cdcta.c
+++ b/src/c/signalProcessing/transforms/dct/cdcta.c
@@ -15,6 +15,7 @@
 #include "addition.h"
 #include "types.h"
 #include "floatComplex.h" 
+#include "multiplication.h"
 /*#include "matrixMultiplication"*/
 /*#include <fftw3.h>*/
 #include <math.h>
@@ -24,10 +25,10 @@ void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out)
 	int i,j,k,u,v;
 	int n;
 	int x,y;
-	float res,ress;
+	float res,ress,vv,ff;
 	float re,z,q,m;
 	floatComplex accu = FloatComplex(0, 0);
-	floatComplex temp,mm;
+	floatComplex temp,mm,aa,bb,cc;
 	if(sign==-1)
 	{
 		if(row==1)
@@ -43,17 +44,25 @@ void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out)
 					{
 						for(j=0;j<col;j++)
 						{
-							y=row*j+i;		
-							temp=in[y]*(cos(((M_PI)*(y+1-1./2.)*(x))/n));
+							y=row*j+i;
+							vv = cos(((M_PI)*(y+1-1./2.)*(x))/n);
+							aa = FloatComplex(vv,0);		
+							temp=cmuls(in[y],aa);
 							out[x]=cadds(out[x],temp);
 						}
 					}
 					if(x==0)
-					out[x]*=1./(sqrt(n));
+					{
+						vv = 1./(sqrt(n));
+						aa = FloatComplex(vv,0);
+						out[x]=cmuls(out[x],aa);
+					}
 					else
 					{
 						float res=2./n;
-						out[x]*=sqrt(res);
+						res = sqrt(res);
+						aa = FloatComplex(res,0);
+						out[x]=cmuls(out[x],aa);
 					}
 				}
 			}
@@ -76,29 +85,53 @@ void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out)
 							y=j*row+i;
 							z=(float)(((float)j+1.0/2.0)*(float)v);
 							q=(float)(M_PI/(float)col);
-							mm=in[y]*(cos(q*z));	
+							vv = cos(q*z);
+							aa = FloatComplex(vv,0);
+							mm=cmuls(in[y],aa);
 							temp=cadds(temp,mm);
 						}
 						z=(float)(((float)i+1.0/2.0)*(float)u);
 						q=(float)(M_PI/(float)row);
-						temp*=cos(q*z);
+						ff = cos(q*z);
+						bb = FloatComplex(ff,0);
+						temp=cmuls(temp,bb);
 						out[x]=cadds(out[x],temp);
 						}
 					if(u==0)
 					{
-						out[x]*=1./sqrt((float)row);
+						vv = 1./sqrt((float)row);
+						aa = FloatComplex(vv,0);
+						out[x]=cmuls(out[x],aa);
 						if(v==0)
-						out[x]*=1./sqrt((float)col);
+						{
+							vv = 1./sqrt((float)col);
+							aa = FloatComplex(vv,0);
+							out[x]=cmuls(out[x],aa);
+						}
 						else
-						out[x]*=sqrt(2./col);
+						{
+							vv = sqrt(2./col);
+							aa = FloatComplex(vv,0);
+							out[x]=cmuls(out[x],aa);
+						}
 					}
 					else
 					{
-						out[x]*=sqrt(2./row);
+						vv = sqrt(2./row);
+						aa = FloatComplex(vv,0);
+						out[x]=cmuls(out[x],aa);
 						if(v==0)
-						out[x]*=1./sqrt((float)col);
+						{
+							vv = 1./sqrt((float)col);
+							aa = FloatComplex(vv,0);
+							out[x]=cmuls(out[x],aa);
+						}
 						else
-						out[x]*=sqrt(2./col);
+						{
+							vv = sqrt(2./col);
+							aa = FloatComplex(vv,0);
+							out[x]=cmuls(out[x],aa);
+						}
 					}
 				}
 			}
@@ -125,12 +158,14 @@ void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out)
 							if(y==0)
 							{
 								q=res*(cos(((M_PI)*(j)*(v+1./2.))/n));
-								out[x]=cadds(out[x],in[y]*q);
+								aa = FloatComplex(q,0);
+								out[x]=cadds(out[x],cmuls(in[y],aa));
 							}
 							else
 							{
 								q=ress*(cos(((M_PI)*(j)*(v+1./2.))/n));
-								out[x]=cadds(out[x],in[y]*q);
+								aa = FloatComplex(q,0);
+								out[x]=cadds(out[x],cmuls(in[y],aa));
 							}
 						}
 					}
@@ -156,19 +191,37 @@ void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out)
 							y=row*j+i;
 							mm=in[j*row+i];
 							z=(float)(((float)v+1.0/2.0)*(float)j);
-							q=(float)(M_PI/(float)col);	
-							mm=mm*(cos(q*z));
+							q=(float)(M_PI/(float)col);
+							vv = cos(q*z);
+							aa = FloatComplex(vv,0);		
+							mm=cmuls(mm,aa);
 							if(j==0)
-							temp=cadds(temp,mm*(1./sqrt((float)col)));
+							{
+								vv = 1./sqrt((float)col);
+								aa = FloatComplex(vv,0);
+								temp=cadds(temp,cmuls(mm,aa));
+							}		
 							else
-							temp=cadds(temp,mm*sqrt(2./col));
+							{
+								vv = sqrt(2./col);
+								aa = FloatComplex(vv,0);
+								temp=cadds(temp,cmuls(mm,aa));
+							}
 						}
 						z=(float)(((float)u+1.0/2.0)*(float)i);
 						q=(float)(M_PI/(float)row);	
 						if(i==0)
-						out[x]=cadds(out[x],temp*((cos(z*q))*(1./sqrt(row))));
+						{	
+							vv = (cos(z*q))*(1./sqrt(row));
+							aa = FloatComplex(vv,0);
+							out[x]=cadds(out[x],cmuls(temp,aa));
+						}
 						else
-						out[x]=cadds(out[x],temp*((cos(z*q))*sqrt(2./row)));
+						{
+							vv = (cos(z*q))*sqrt(2./row);
+							aa = FloatComplex(vv,0);
+							out[x]=cadds(out[x],cmuls(temp,aa));
+						}
 					}
 				}
 			}
-- 
cgit