diff options
author | mguetlein <martin.guetlein@gmail.com> | 2011-02-10 09:18:52 +0100 |
---|---|---|
committer | mguetlein <martin.guetlein@gmail.com> | 2011-02-10 09:18:52 +0100 |
commit | c957aae6cae380681ff2feac27222ac1decf44ae (patch) | |
tree | a1b107fa4f20f8f99df9fa264b49c2bfdeefc467 | |
parent | 255f70b3bda4997b37ef3139c527ea9f481665bd (diff) |
merged mr algorithm manually
-rw-r--r-- | Rakefile | 12 | ||||
-rw-r--r-- | lazar.rb | 4 |
2 files changed, 8 insertions, 8 deletions
@@ -30,10 +30,10 @@ namespace "fminer" do end puts `make ruby` Dir.chdir('../../last-utils') - puts `git fetch` + #puts `git fetch` # AM LAST: need branch 'experimental' until merged to master in last-utils - puts `git checkout -f -b experimental origin/experimental` - puts `git checkout experimental` + #puts `git checkout -f -b experimental origin/experimental` + puts `git checkout master` puts `git pull` end @@ -63,10 +63,10 @@ namespace "fminer" do end puts `make ruby` Dir.chdir('../../last-utils') - puts `git fetch` + #puts `git fetch` # AM LAST: need branch 'experimental' until merged to master in last-utils - puts `git checkout -f -b experimental origin/experimental` - puts `git checkout experimental` + #puts `git checkout -f -b experimental origin/experimental` + puts `git checkout master` puts `git pull` end end @@ -25,8 +25,8 @@ end # @param [String] dataset_uri Training dataset URI # @param [optional,String] prediction_feature URI of the feature to be predicted # @param [optional,String] feature_generation_uri URI of the feature generation algorithm -# @param [optional] - further parameters for the feature generation service -# @ return [text/uri-list] Task URI +# @param [optional,String] - further parameters for the feature generation service +# @return [text/uri-list] Task URI post '/lazar/?' do halt 404, "No dataset_uri parameter." unless params[:dataset_uri] |