Skip to content

Commit

Permalink
fixed GSMat float bug
Browse files Browse the repository at this point in the history
  • Loading branch information
jcanny committed May 5, 2015
1 parent c3e9c59 commit 9b1557e
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/main/scala/BIDMat/GSMat.scala
Original file line number Diff line number Diff line change
Expand Up @@ -297,18 +297,18 @@ class GSPair (val omat:Mat, val mat:GSMat) extends Pair {
override def ^* (b : Mat):Mat = Mop_TTimes.op(mat, b, omat)
override def Tx (b : Mat):Mat = Mop_TTimes.op(mat, b, omat)

def + (a:Float) = mat.GSDop(GMat(a), omat, BinOp.op_add);
def - (a:Float) = mat.GSDop(GMat(a), omat, BinOp.op_sub);
def *@ (a:Float) = mat.GSDop(GMat(a), omat, BinOp.op_mul);
def (a:Float) = mat.GSDop(GMat(a), omat, BinOp.op_mul);
def / (a:Float) = mat.GSDop(GMat(a), omat, BinOp.op_div);

def != (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_ne);
def > (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_gt);
def < (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_lt);
def <= (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_le);
def >= (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_ge);
def == (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_eq);
override def + (a:Float) = mat.GSDop(GMat(a), omat, BinOp.op_add);
override def - (a:Float) = mat.GSDop(GMat(a), omat, BinOp.op_sub);
override def *@ (a:Float) = mat.GSDop(GMat(a), omat, BinOp.op_mul);
override def (a:Float) = mat.GSDop(GMat(a), omat, BinOp.op_mul);
override def / (a:Float) = mat.GSDop(GMat(a), omat, BinOp.op_div);

override def != (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_ne);
override def > (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_gt);
override def < (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_lt);
override def <= (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_le);
override def >= (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_ge);
override def == (a : Float):GSMat = mat.GSDop(GMat(a), omat, BinOp.op_eq);

override def * (b : Mat) = Mop_Times.op(mat, b, null)
override def *^ (b : Mat) = Mop_TimesT.op(mat, b, null)
Expand Down

0 comments on commit 9b1557e

Please sign in to comment.