diff options
author | Andreas Maunz <andreas@maunz.de> | 2012-02-09 15:44:28 +0100 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2012-02-09 15:44:28 +0100 |
commit | 7a37114695d783a770cdca854df36cc4ee347758 (patch) | |
tree | 7c00197151b077646f9cb3c4e3406d0e6fd58781 /dataset.rb | |
parent | 1a0957e830030b9c376eb298f9e8a837249d3296 (diff) | |
parent | 82f8512dc5e2de822433e2dcec3b579962e6ae2a (diff) |
Merge branch 'pc_new_1' into development
Conflicts:
algorithm.rb
dataset.rb
lazar.rb
Diffstat (limited to 'dataset.rb')
-rw-r--r-- | dataset.rb | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -28,8 +28,13 @@ class DatasetTest < Test::Unit::TestCase #@new_dataset.delete end -=begin -=end +# def test_get_pc +# ds_uri = OpenTox::RestClientWrapper.post(CONFIG[:services]["opentox-dataset"], {:file => File.new("data/EPAFHM.csv")} ,{:accept => "text/uri-list", :subjectid => @@subjectid}).to_s.chomp +# puts "DS: #{ds_uri}" +# fds_uri = OpenTox::Algorithm.pc_descriptors( { :dataset_uri => ds_uri, :pc_type => "constitutional" } ) +# puts "FDS: #{fds_uri}" +# end + def test_save_external @dataset = OpenTox::Dataset.find "http://apps.ideaconsult.net:8080/ambit2/dataset/2698" @@ -220,9 +225,7 @@ class DatasetTest < Test::Unit::TestCase end end -=begin -=end - + def test_merge() #upload dataset1 = OpenTox::Dataset.create_from_csv_file(File.new("data/hamster_carcinogenicity.csv").path, @@subjectid) |