From 9ce6ec5afefa085ad029cd4663cc13a963a081c4 Mon Sep 17 00:00:00 2001 From: Richard Townsend Date: Thu, 3 Jul 2014 09:44:06 +0100 Subject: [PATCH 1/2] Trying to fix Travis --- .travis.yml | 2 +- linear_models/liblinear.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3fe6bd..8fe7e4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ go: - tip before_install: - sudo apt-get update -qq - - sudo apt-get install -qq libatlas-base-dev + - sudo apt-get install -qq libatlas-base-dev liblinear-dev install: - go get github.com/smartystreets/goconvey/convey - go get -v ./... diff --git a/linear_models/liblinear.go b/linear_models/liblinear.go index e982b47..ab6a209 100644 --- a/linear_models/liblinear.go +++ b/linear_models/liblinear.go @@ -1,7 +1,7 @@ package linear_models /* -#cgo LDFLAGS: -L ../ext/lib -llinear +#cgo LDFLAGS: -llinear #cgo CFLAGS: -I ../ext/liblinear_src #include */ From 94a562be35c9015bfc11e859ecf91933aeedaf63 Mon Sep 17 00:00:00 2001 From: Richard Townsend Date: Thu, 3 Jul 2014 10:07:19 +0100 Subject: [PATCH 2/2] Uses the system version of liblinear Conflicts: linear_models/liblinear.go --- linear_models/liblinear.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/linear_models/liblinear.go b/linear_models/liblinear.go index ab6a209..94893c5 100644 --- a/linear_models/liblinear.go +++ b/linear_models/liblinear.go @@ -2,7 +2,7 @@ package linear_models /* #cgo LDFLAGS: -llinear -#cgo CFLAGS: -I ../ext/liblinear_src +#cgo CFLAGS: #include */ import "C" @@ -28,9 +28,6 @@ const ( L1R_L2LOSS_SVC = C.L1R_L2LOSS_SVC L1R_LR = C.L1R_LR L2R_LR_DUAL = C.L2R_LR_DUAL - L2R_L2LOSS_SVR = C.L2R_L2LOSS_SVR - L2R_L2LOSS_SVR_DUAL = C.L2R_L2LOSS_SVR_DUAL - L2R_L1LOSS_SVR_DUAL = C.L2R_L1LOSS_SVR_DUAL ) func NewParameter(solver_type int, C float64, eps float64) *Parameter { @@ -41,7 +38,6 @@ func NewParameter(solver_type int, C float64, eps float64) *Parameter { param.c_param.nr_weight = C.int(0) param.c_param.weight_label = nil param.c_param.weight = nil - param.c_param.p = C.double(0.1) return ¶m } @@ -52,9 +48,9 @@ func NewProblem(X [][]float64, y []float64, bias float64) *Problem { prob.c_prob.n = C.int(len(X[0]) + 1) prob.c_prob.x = convert_features(X, bias) - c_y := make([]C.double, len(y)) + c_y := make([]C.int, len(y)) for i := 0; i < len(y); i += 1 { - c_y[i] = C.double(y[i]) + c_y[i] = C.int(y[i]) } prob.c_prob.y = &c_y[0] prob.c_prob.bias = C.double(-1)