From 79f469725862e0bc1ee1be9b7e2d6cdb12911e76 Mon Sep 17 00:00:00 2001
From: nutricato
Date: Thu, 4 Jun 2009 04:51:29 +0000
Subject: 

---
 .../test999_WorkingDir/scilabcode/LinComb.sci      | 16 --------
 .../test999_WorkingDir/scilabcode/mainfunction.sci | 44 +++++++++++++---------
 2 files changed, 27 insertions(+), 33 deletions(-)
 delete mode 100644 src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/LinComb.sci

(limited to 'src/Scilab2C/SCI2CTests/test999_WorkingDir')

diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/LinComb.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/LinComb.sci
deleted file mode 100644
index 9f74b454..00000000
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/LinComb.sci
+++ /dev/null
@@ -1,16 +0,0 @@
-//SCI2C: NIN=          6
-//SCI2C: NOUT=         1
-//SCI2C: OUT(1).TP=    IN(1).TP
-//SCI2C: OUT(1).SZ(1)= IN(2).SZ(1)
-//SCI2C: OUT(1).SZ(2)= IN(2).SZ(2)
-
-//SCI2C: DEFAULT_PRECISION= DOUBLE
-
-function z = LinComb(a,x,b,y,t1,t2)
-
-t1 = a*x;
-t2 = b*y;
-z = t1+t2;
-// z = a*x+b*y;
-
-endfunction
diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index 0fafb592..e39f7648 100644
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -1,20 +1,30 @@
 //SCI2C: DEFAULT_PRECISION= DOUBLE
 
-function mainfunction()
-
-//test OpColon
-
-
-2+%i:2-%i
-
-1+%i:6+%i*5
-
-2+%i*3:1-%i*4:2+%i*2
-
-2+%i:1+%i:5+%i
-
-1+%i:2+%i:1+%i
-
-1+%i:3+%i:10+%i
-
+function mainfunction()
+
+// ------------------------------
+// --- Simple Scalar Addition ---
+// ------------------------------
+a = 1;
+b = 2;
+c = 0;
+c = a + b;
+disp(c);
+
+// ------------------------------
+// --- Trigonometric Identity ---
+// ------------------------------
+x = (1:3)' * (4:9);
+y = (sin(x).^2) + (cos(x).^2);
+disp(x);
+disp(y-ones(3,6));
+
+// -------------------------------
+// --- Computation of Distance ---
+// -------------------------------
+// generate a vector w 
+w = cos(sin(cos(x*3)*2).* x+ones(3,6).*cos(x-sin(y*2))); 
+distxw = sqrt(x.^2 + w.^2);
+disp(distxw);
 endfunction
+   
\ No newline at end of file
-- 
cgit