From 44d80efb58e8a923834105e6687e8b4c04f2ef2d Mon Sep 17 00:00:00 2001
From: tekhnofiend <nishantmehta.x@gmail.com>
Date: Thu, 17 Jan 2008 18:04:45 +0000
Subject: [PATCH] polished niche/fastica

---
 fastlib/u/niche/functional/prelim_funcica.m      | 10 ++++++++--
 fastlib/u/niche/functional/test_smooth_funcica.m |  8 ++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fastlib/u/niche/functional/prelim_funcica.m b/fastlib/u/niche/functional/prelim_funcica.m
index 13a2c29c0e..4834c87fb2 100644
--- a/fastlib/u/niche/functional/prelim_funcica.m
+++ b/fastlib/u/niche/functional/prelim_funcica.m
@@ -30,15 +30,21 @@ x = x - repmat(mean(x')', 1, N);
 
 
 % generate b-spline basis curves
-t = linspace(0,1,3000);
+t = linspace(0,1,1000);
 
 
 load s1s2_10;
 s = [s1(t); s2(t)]';
-z = normrnd(zeros(length(t), N), 1);
+z = normrnd(zeros(length(t), N), .2);
 
 data = s * x;
 
 data = data + z;
 
+indices = 1:10:1000;
+t = t(indices);
+data = data(indices,:);
+
+
+
 %data = noisy_data;
diff --git a/fastlib/u/niche/functional/test_smooth_funcica.m b/fastlib/u/niche/functional/test_smooth_funcica.m
index ac8a6a7b63..ac7b586e51 100644
--- a/fastlib/u/niche/functional/test_smooth_funcica.m
+++ b/fastlib/u/niche/functional/test_smooth_funcica.m
@@ -7,13 +7,13 @@
 N = size(data, 2);
 p = 30; % hardcoded for now
 
-mybasis = create_bspline_basis([0 1], p, 4);
+mybasis = create_bspline_basis([0 .9910], 100, 4);
 basis_curves = eval_basis(t, mybasis);
 basis_inner_products = full(eval_penalty(mybasis, int2Lfd(0)));
 
 myfd_data = data2fd(data, t, mybasis);
 
-cut_fraction = .5;
+cut_fraction = .01;
 
 cut = round(cut_fraction * N);
 data_coef = getcoef(myfd_data);
@@ -26,8 +26,8 @@ num_tests = 1;
 %data = data(indices,:);
 
 
-%lambda_set = 0;
-lambda_set = [0 1e-6 1e-5 1e-4 1e-3 5e-3 1e-2];
+lambda_set = 0;
+%lambda_set = [0 1e-6 1e-5 1e-4 1e-3 5e-3 1e-2];
 
 myfdPar_set = cell(1,length(lambda_set));
 for lambda_i = 1:length(lambda_set)