From 11095a22c59bed6a011723641dfb782415e2c02b Mon Sep 17 00:00:00 2001
From: Alberto Ruiz <aruiz@um.es>
Date: Mon, 25 May 2015 08:46:59 +0200
Subject: range

---
 packages/base/src/C/vector-aux.c                  |  8 ++++++++
 packages/base/src/Data/Packed/Internal/Numeric.hs |  2 +-
 packages/base/src/Numeric/LinearAlgebra/Data.hs   |  4 ++--
 packages/base/src/Numeric/LinearAlgebra/Static.hs |  2 +-
 packages/base/src/Numeric/Vectorized.hs           | 13 ++++++++++++-
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/packages/base/src/C/vector-aux.c b/packages/base/src/C/vector-aux.c
index b67275f..134ca7a 100644
--- a/packages/base/src/C/vector-aux.c
+++ b/packages/base/src/C/vector-aux.c
@@ -1040,3 +1040,11 @@ int div_vector(int m, KIVEC(v), IVEC(r)) {
     OK
 }
 
+int range_vector(IVEC(r)) {
+    int k;
+    for(k=0; k<rn; k++) {
+        rp[k] = k;
+    }
+    OK
+}
+
diff --git a/packages/base/src/Data/Packed/Internal/Numeric.hs b/packages/base/src/Data/Packed/Internal/Numeric.hs
index fec8c05..60dd167 100644
--- a/packages/base/src/Data/Packed/Internal/Numeric.hs
+++ b/packages/base/src/Data/Packed/Internal/Numeric.hs
@@ -39,7 +39,7 @@ module Data.Packed.Internal.Numeric (
     roundVector, fromInt,
     RealOf, ComplexOf, SingleOf, DoubleOf,
     IndexOf,
-    CInt, Extractor(..), (??),
+    CInt, Extractor(..), (??), range,
     module Data.Complex
 ) where
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/Data.hs b/packages/base/src/Numeric/LinearAlgebra/Data.hs
index 7bc0497..b40054c 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Data.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Data.hs
@@ -28,7 +28,7 @@ module Numeric.LinearAlgebra.Data(
     Indexable(..),
     
     -- * Construction
-    scalar, Konst(..), Build(..), assoc, accum, linspace, -- ones, zeros,
+    scalar, Konst(..), Build(..), assoc, accum, linspace, range,-- ones, zeros,
 
     -- * Diagonal
     ident, diag, diagl, diagRect, takeDiag,
@@ -82,6 +82,6 @@ import Numeric.LinearAlgebra.Util hiding ((&),(#))
 import Data.Complex
 import Numeric.Sparse
 import Data.Packed.Internal.Vector(Idxs)
-import Data.Packed.Internal.Numeric(CInt,Extractor(..),(??),fromInt)
+import Data.Packed.Internal.Numeric(CInt,Extractor(..),(??),fromInt,range)
 
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/Static.hs b/packages/base/src/Numeric/LinearAlgebra/Static.hs
index 25b10b4..f7017e7 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Static.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Static.hs
@@ -65,7 +65,7 @@ import Numeric.LinearAlgebra hiding (
     row,col,vector,matrix,linspace,toRows,toColumns,
     (<\>),fromList,takeDiag,svd,eig,eigSH,eigSH',
     eigenvalues,eigenvaluesSH,eigenvaluesSH',build,
-    qr,size,app,mul,dot,chol)
+    qr,size,app,mul,dot,chol,range)
 import qualified Numeric.LinearAlgebra as LA
 import Data.Proxy(Proxy)
 import Numeric.LinearAlgebra.Static.Internal
diff --git a/packages/base/src/Numeric/Vectorized.hs b/packages/base/src/Numeric/Vectorized.hs
index 70bd48b..d0ff562 100644
--- a/packages/base/src/Numeric/Vectorized.hs
+++ b/packages/base/src/Numeric/Vectorized.hs
@@ -19,7 +19,8 @@ module Numeric.Vectorized (
     FunCodeVV(..), vectorZipR, vectorZipC, vectorZipF, vectorZipQ, vectorZipI,
     vectorScan, saveMatrix,
     Seed, RandDist(..), randomVector,
-    sortVector, roundVector
+    sortVector, roundVector,
+    range
 ) where
 
 import Data.Packed.Internal.Common
@@ -389,3 +390,13 @@ roundVector v = unsafePerformIO $ do
 
 foreign import ccall unsafe "round_vector" c_round_vector :: TVV
 
+--------------------------------------------------------------------------------
+
+range :: Int -> Idxs
+range n = unsafePerformIO $ do
+    r <- createVector n
+    app1 c_range_vector vec r "range"
+    return r
+
+foreign import ccall unsafe "range_vector" c_range_vector :: CV CInt (IO CInt)
+
-- 
cgit v1.2.3