From 04af01b8135ea147e9ce253e5526e3ee3adcc675 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Fri, 7 Aug 2015 19:50:09 +0200
Subject: initial k-nn weighted average implementation

---
 lib/feature.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/feature.rb')

diff --git a/lib/feature.rb b/lib/feature.rb
index 0801a47..005d78f 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -27,7 +27,8 @@ module OpenTox
   end
 
   class Smarts < NominalFeature
-    field :name, as: :smarts, type: String # causes warnings
+    field :smarts, type: String 
+    #field :name, as: :smarts, type: String # causes warnings
     field :algorithm, type: String, default: "OpenTox::Algorithm::Descriptors.smarts_match"
     field :parameters, type: Hash, default: {:count => false}
     def initialize params
@@ -46,6 +47,10 @@ module OpenTox
     end
   end
 
+  class FingerprintSmarts < Smarts
+    field :count, type: Integer
+  end
+
   class NominalBioAssay < NominalFeature
     field :description, type: String
   end
-- 
cgit v1.2.3