added demo file

some output changes Signed-off-by: Carsten Witzke <carsten@staticline.de>
whiskey · May 9, 2011 · 2c9468f · 2c9468f
1 parent 1ebcbfc
commit 2c9468f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,3 @@
 .settings
 .checkstyle*
 data.db
-Playground.*
diff --git a/src/de/staticline/regression/SimpleRegression.py b/src/de/staticline/regression/SimpleRegression.py
@@ -7,7 +7,6 @@
 '''
 
 from numpy import *
-from math import sqrt
 from numpy.linalg.linalg import inv
 
 class RidgeRegression(object):
@@ -32,13 +31,7 @@ def trainModel(self, train):
         f2 = y - dot(x,self.get_model())
         f3 = dot(dot(self.__complexity,self.__model.transpose()),self.__model)
         rss = dot(f1,f2) + f3
-        print 'RSS ?= %f' % rss
-
-        #RSS old school
-        #diff = train.get_matrix() - self.__model
-        #print diff
-        #print diff**2
-
+        print 'RSS = %f' % rss #TODO: validate RSS        
 
     def validate_model(self, test):#FIXME: make new
         testdata = matrix(test.get_matrix())
@@ -60,6 +53,5 @@ def set_lambda(self, value):
     def get_model(self):
         return self.__model
 
-
     complexity = property(get_lambda, set_lambda, doc='the model complexity factor lambda')
     model = property(get_model, doc='the learned model')
diff --git a/src/de/staticline/tests/RegressionTests.py b/src/de/staticline/tests/RegressionTests.py
@@ -10,7 +10,6 @@
 
 class Test(unittest.TestCase):
 
-
     def testRidgeRegression(self):
         _x = matrix('1 1 2; 1 2 3; 1 4 1; 1 5 5')
         _y = matrix('3;2;7;1')