merge errors of examples

Author: jurgen-lentz

examples/efficientfrontier.R

@@ -60,22 +60,14 @@ efficientfrontier <- function(solver=NULL, modelDirectory=NULL) {
     ampl$eval("let stockopall:={};let stockrun:=stockall;")
     # Relax integrality
     ampl$setOption("relax_integrality", TRUE)
-<<<<<<< HEAD
     ampl$solve("", "gurobi")
-=======
-    ampl$solve("", "")
->>>>>>> master
     cat(sprintf("QP result = %g\n", variance$value()))
     # Adjust included stocks
     ampl$eval("let stockrun:={i in stockrun:weights[i]>0};")
     ampl$eval("let stockopall:={i in stockrun:weights[i]>0.5};")
     # Set integrality back
     ampl$setOption("relax_integrality", FALSE)
-<<<<<<< HEAD
     ampl$solve("", "gurobi")
-=======
-    ampl$solve("", "")
->>>>>>> master
     cat(sprintf("QMIP result = %g\n", variance$value()))
     # Store data of corrent frontier point
     returns <- c(returns, maxret - (i - 1) * stepsize)

examples/firstexample.R

@@ -47,11 +47,7 @@ firstexample <- function(solver=NULL, modelDirectory=NULL) {
   cat(sprintf("Updated all costs.\n"))
 
   # Resolve and display objective
-<<<<<<< HEAD
   ampl$solve("", "gurobi")
-=======
-  ampl$solve("", "")
->>>>>>> master
   cat(sprintf("New objective value: %f\n", totalcost$value()))
 
   # Get the values of the variable Buy in a dataframe object

examples/trackingmodel.R

@@ -62,10 +62,6 @@ trackingmodel <- function(solver=NULL, modelDirectory=NULL) {
   # Get back to the integer problem
   ampl$setOption("relax_integrality", FALSE)
   # Solve the (integer) problem
-<<<<<<< HEAD
   ampl$solve("", "gurobi")
-=======
-  ampl$solve("", "")
->>>>>>> master
   cat(sprintf("QMIP objective value %g\n", ampl$getObjectives()[[1]]$value()))
 }