diff options
| author | root <root@ot-dev.in-silico.ch> | 2011-03-03 12:36:10 +0000 |
|---|---|---|
| committer | root <root@ot-dev.in-silico.ch> | 2011-03-03 12:36:10 +0000 |
| commit | d0dbdc711cddff823db456136a2604ab1912ee53 (patch) | |
| tree | 1675dbc426fb09a3b2a4d67d0ad88664d52f94be /test/test_examples.rb | |
| parent | 6e9d20a1417ad2f4548194d226f6b3f2b3c47036 (diff) | |
remaining merge conflicts removed
Diffstat (limited to 'test/test_examples.rb')
| -rwxr-xr-x | test/test_examples.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/test/test_examples.rb b/test/test_examples.rb index 9476ed7..3c6f00e 100755 --- a/test/test_examples.rb +++ b/test/test_examples.rb @@ -188,11 +188,7 @@ module ValidationExamples class LazarHamsterTrainingTest < HamsterTrainingTest def initialize @algorithm_uri = File.join(CONFIG[:services]["opentox-algorithm"],"lazar") -<<<<<<< HEAD - @algorithm_params = "feature_generation_uri="+File.join(CONFIG[:services]["opentox-algorithm"],"fminer") -======= @algorithm_params = "feature_generation_uri="+File.join(CONFIG[:services]["opentox-algorithm"],"fminer/bbrc") ->>>>>>> mguetlein/test super end end @@ -220,11 +216,7 @@ module ValidationExamples class LazarHamsterCrossvalidation < HamsterCrossvalidation def initialize @algorithm_uri = File.join(CONFIG[:services]["opentox-algorithm"],"lazar") -<<<<<<< HEAD - @algorithm_params = "feature_generation_uri="+File.join(CONFIG[:services]["opentox-algorithm"],"fminer") -======= @algorithm_params = "feature_generation_uri="+File.join(CONFIG[:services]["opentox-algorithm"],"fminer/bbrc") ->>>>>>> mguetlein/test super end end |