merged mr algorithm manually

2 files changed, 8 insertions, 8 deletions

diff --git a/Rakefile b/Rakefile
index d52f60d..e60ffc7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -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
diff --git a/lazar.rb b/lazar.rb
index fc037a9..c8cf6ea 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -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]