diff options
author | Alberto Ruiz <aruiz@um.es> | 2014-04-24 10:30:01 +0200 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2014-04-24 10:30:01 +0200 |
commit | 6fbed842525491e280448a00a4b5426e6830ccaa (patch) | |
tree | b78d2712f7ac23845fc29120d3a9fbcd7d189004 /lib/Numeric/ContainerBoot.hs | |
parent | 7c5adb83c9cb632c39eb2d844a1496e2a7a23e8b (diff) |
cdot and (×)
added cdot
dot renamed to udot
<.> changed to cdot and moved to Numeric.LinearAlgebra.Util
new general contraction operator (×)
Plot functions moved to Numeric.LinearAlgebra.Util
Diffstat (limited to 'lib/Numeric/ContainerBoot.hs')
-rw-r--r-- | lib/Numeric/ContainerBoot.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Numeric/ContainerBoot.hs b/lib/Numeric/ContainerBoot.hs index dcb326c..4c5bbd0 100644 --- a/lib/Numeric/ContainerBoot.hs +++ b/lib/Numeric/ContainerBoot.hs | |||
@@ -327,8 +327,8 @@ instance (Container Vector a) => Container Matrix a where | |||
327 | class Element e => Product e where | 327 | class Element e => Product e where |
328 | -- | matrix product | 328 | -- | matrix product |
329 | multiply :: Matrix e -> Matrix e -> Matrix e | 329 | multiply :: Matrix e -> Matrix e -> Matrix e |
330 | -- | dot (inner) product | 330 | -- | (unconjugated) dot product |
331 | dot :: Vector e -> Vector e -> e | 331 | udot :: Vector e -> Vector e -> e |
332 | -- | sum of absolute value of elements (differs in complex case from @norm1@) | 332 | -- | sum of absolute value of elements (differs in complex case from @norm1@) |
333 | absSum :: Vector e -> RealOf e | 333 | absSum :: Vector e -> RealOf e |
334 | -- | sum of absolute value of elements | 334 | -- | sum of absolute value of elements |
@@ -341,7 +341,7 @@ class Element e => Product e where | |||
341 | instance Product Float where | 341 | instance Product Float where |
342 | norm2 = toScalarF Norm2 | 342 | norm2 = toScalarF Norm2 |
343 | absSum = toScalarF AbsSum | 343 | absSum = toScalarF AbsSum |
344 | dot = dotF | 344 | udot = dotF |
345 | norm1 = toScalarF AbsSum | 345 | norm1 = toScalarF AbsSum |
346 | normInf = maxElement . vectorMapF Abs | 346 | normInf = maxElement . vectorMapF Abs |
347 | multiply = multiplyF | 347 | multiply = multiplyF |
@@ -349,7 +349,7 @@ instance Product Float where | |||
349 | instance Product Double where | 349 | instance Product Double where |
350 | norm2 = toScalarR Norm2 | 350 | norm2 = toScalarR Norm2 |
351 | absSum = toScalarR AbsSum | 351 | absSum = toScalarR AbsSum |
352 | dot = dotR | 352 | udot = dotR |
353 | norm1 = toScalarR AbsSum | 353 | norm1 = toScalarR AbsSum |
354 | normInf = maxElement . vectorMapR Abs | 354 | normInf = maxElement . vectorMapR Abs |
355 | multiply = multiplyR | 355 | multiply = multiplyR |
@@ -357,7 +357,7 @@ instance Product Double where | |||
357 | instance Product (Complex Float) where | 357 | instance Product (Complex Float) where |
358 | norm2 = toScalarQ Norm2 | 358 | norm2 = toScalarQ Norm2 |
359 | absSum = toScalarQ AbsSum | 359 | absSum = toScalarQ AbsSum |
360 | dot = dotQ | 360 | udot = dotQ |
361 | norm1 = sumElements . fst . fromComplex . vectorMapQ Abs | 361 | norm1 = sumElements . fst . fromComplex . vectorMapQ Abs |
362 | normInf = maxElement . fst . fromComplex . vectorMapQ Abs | 362 | normInf = maxElement . fst . fromComplex . vectorMapQ Abs |
363 | multiply = multiplyQ | 363 | multiply = multiplyQ |
@@ -365,7 +365,7 @@ instance Product (Complex Float) where | |||
365 | instance Product (Complex Double) where | 365 | instance Product (Complex Double) where |
366 | norm2 = toScalarC Norm2 | 366 | norm2 = toScalarC Norm2 |
367 | absSum = toScalarC AbsSum | 367 | absSum = toScalarC AbsSum |
368 | dot = dotC | 368 | udot = dotC |
369 | norm1 = sumElements . fst . fromComplex . vectorMapC Abs | 369 | norm1 = sumElements . fst . fromComplex . vectorMapC Abs |
370 | normInf = maxElement . fst . fromComplex . vectorMapC Abs | 370 | normInf = maxElement . fst . fromComplex . vectorMapC Abs |
371 | multiply = multiplyC | 371 | multiply = multiplyC |