3 files changed, 14 insertions, 13 deletions

diff --git a/packages/glpk/hmatrix-glpk.cabal b/packages/glpk/hmatrix-glpk.cabal
index 5a1b59c..e64e3e8 100644
--- a/packages/glpk/hmatrix-glpk.cabal
+++ b/packages/glpk/hmatrix-glpk.cabal
@@ -1,5 +1,5 @@
 Name:               hmatrix-glpk
-Version:            0.4.1.0
+Version:            0.5.0.0
 License:            GPL
 License-file:       LICENSE
 Author:             Alberto Ruiz
@@ -23,7 +23,7 @@ extra-source-files:     examples/simplex1.hs
                         examples/simplex5.hs
 
 library
-    Build-Depends:      base <5, hmatrix >= 0.16, containers >= 0.5.4.0
+    Build-Depends:      base <5, hmatrix >= 0.17
 
     hs-source-dirs:     src
 
diff --git a/packages/glpk/src/Numeric/LinearProgramming.hs b/packages/glpk/src/Numeric/LinearProgramming.hs
index 6a0c47d..7bf4279 100644
--- a/packages/glpk/src/Numeric/LinearProgramming.hs
+++ b/packages/glpk/src/Numeric/LinearProgramming.hs
@@ -85,8 +85,8 @@ module Numeric.LinearProgramming(
     Solution(..)
 ) where
 
-import Data.Packed
-import Data.Packed.Development
+import Numeric.LinearAlgebra.HMatrix
+import Numeric.LinearAlgebra.Devel hiding (Dense)
 import Foreign(Ptr)
 import System.IO.Unsafe(unsafePerformIO)
 import Foreign.C.Types
@@ -180,16 +180,17 @@ exact opt constr@(General _) bnds = exact opt (sparseOfGeneral constr) bnds
 
 adapt :: Optimization -> (Int, Double, [Double])
 adapt opt = case opt of
-    Maximize x -> (size x, 1 ,x)
-    Minimize x -> (size x, -1, (map negate x))
- where size x | null x = error "simplex: objective function with zero variables"
-              | otherwise = length x
+    Maximize x -> (sz x, 1 ,x)
+    Minimize x -> (sz x, -1, (map negate x))
+  where
+    sz x | null x = error "simplex: objective function with zero variables"
+         | otherwise = length x
 
 extract :: Double -> Vector Double -> Solution
 extract sg sol = r where
-    z = sg * (sol@>1)
-    v = toList $ subVector 2 (dim sol -2) sol
-    r = case round(sol@>0)::Int of
+    z = sg * (sol!1)
+    v = toList $ subVector 2 (size sol -2) sol
+    r = case round(sol!0)::Int of
           1 -> Undefined
           2 -> Feasible (z,v)
           3 -> Infeasible (z,v)
@@ -261,7 +262,7 @@ mkConstrD n f b1 | ok = fromLists (ob ++ co)
        ok = all (==n) ls
        den = fromLists cs
        ob = map (([0,0]++).return) f
-       co = [[fromIntegral i, fromIntegral j,den@@>(i-1,j-1)]| i<-[1 ..rows den], j<-[1 .. cols den]]
+       co = [[fromIntegral i, fromIntegral j,den `atIndex` (i-1,j-1)]| i<-[1 ..rows den], j<-[1 .. cols den]]
 
 mkConstrS :: Int -> [Double] -> [Bound [(Double, Int)]] -> Matrix Double
 mkConstrS n objfun b1 = fromLists (ob ++ co) where
diff --git a/packages/glpk/src/Numeric/LinearProgramming/L1.hs b/packages/glpk/src/Numeric/LinearProgramming/L1.hs
index f55c721..d7f1258 100644
--- a/packages/glpk/src/Numeric/LinearProgramming/L1.hs
+++ b/packages/glpk/src/Numeric/LinearProgramming/L1.hs
@@ -14,7 +14,7 @@ module Numeric.LinearProgramming.L1 (
     l1SolveU,
 ) where
 
-import Numeric.LinearAlgebra
+import Numeric.LinearAlgebra.HMatrix
 import Numeric.LinearProgramming
 
 -- | L_inf solution of overconstrained system Ax=b.