javaNoviceProgrammer
diff --git a/Collapse file
‎src/symjava/symbolic/Concat.java‎
Copy file name to clipboardExpand all lines: src/symjava/symbolic/Concat.java
+4Lines changed: 4 additions & 0 deletions b/Collapse file
‎src/symjava/symbolic/Concat.java‎
Copy file name to clipboardExpand all lines: src/symjava/symbolic/Concat.java
+4Lines changed: 4 additions & 0 deletions
diff --git a/Collapse file
‎src/symjava/symbolic/Cos.java‎
Copy file name to clipboardExpand all lines: src/symjava/symbolic/Cos.java
+21-6Lines changed: 21 additions & 6 deletions b/Collapse file
‎src/symjava/symbolic/Cos.java‎
Copy file name to clipboardExpand all lines: src/symjava/symbolic/Cos.java
+21-6Lines changed: 21 additions & 6 deletions
diff --git a/Collapse file
‎src/symjava/symbolic/Sin.java‎
Copy file name to clipboardExpand all lines: src/symjava/symbolic/Sin.java
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎src/symjava/symbolic/Sin.java‎
Copy file name to clipboardExpand all lines: src/symjava/symbolic/Sin.java
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎src/symjava/symbolic/utils/BytecodeOpSupport.java‎
Copy file name to clipboardExpand all lines: src/symjava/symbolic/utils/BytecodeOpSupport.java
+9Lines changed: 9 additions & 0 deletions b/Collapse file
‎src/symjava/symbolic/utils/BytecodeOpSupport.java‎
Copy file name to clipboardExpand all lines: src/symjava/symbolic/utils/BytecodeOpSupport.java
+9Lines changed: 9 additions & 0 deletions
@@ -19,6 +19,10 @@
 import com.sun.org.apache.bcel.internal.generic.PUSH;
 import com.sun.org.apache.bcel.internal.generic.Type;
 
+/**
+ * Concatenate symbol matrices or vectors with the same dimension(s)
+ * 
+ */
 public class Concat extends NaryOp {
 
 	public Concat(Expr ...args) {
 
@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import symjava.symbolic.Expr.TYPE;
 import symjava.symbolic.arity.UnaryOp;
 import symjava.symbolic.utils.Utils;
 
@@ -11,13 +12,13 @@
 import com.sun.org.apache.bcel.internal.generic.InstructionHandle;
 import com.sun.org.apache.bcel.internal.generic.InstructionList;
 import com.sun.org.apache.bcel.internal.generic.MethodGen;
+import com.sun.org.apache.bcel.internal.generic.ObjectType;
 import com.sun.org.apache.bcel.internal.generic.Type;
 
 public class Cos extends UnaryOp {
 	public Cos(Expr arg) {
 		super(arg);
-		label = "cos(" + arg + ")";
-		sortKey = label;
+		updateLabel();
 	}
 
 	@Override
@@ -58,10 +59,24 @@ public InstructionHandle bytecodeGen(String clsName, MethodGen mg,
 			InstructionList il, Map<String, Integer> argsMap, int argsStartPos, 
 			Map<Expr, Integer> funcRefsMap) {
 		InstructionHandle startPos = arg.bytecodeGen(clsName, mg, cp, factory, il, argsMap, argsStartPos, funcRefsMap);
-		il.append(factory.createInvoke("java.lang.Math", "cos",
-				Type.DOUBLE, 
-				new Type[] { Type.DOUBLE },
-		Constants.INVOKESTATIC));
+		if(arg.getType() == TYPE.MATRIX || arg.getType() == TYPE.VECTOR) {
+			il.append(factory.createInvoke("symjava.symbolic.utils.BytecodeOpSupport", "cos",
+					new ObjectType("Jama.Matrix"), 
+					new Type[] { new ObjectType("Jama.Matrix") },
+					Constants.INVOKESTATIC));
+		} else {
+			il.append(factory.createInvoke("java.lang.Math", "cos",
+					Type.DOUBLE, 
+					new Type[] { Type.DOUBLE },
+					Constants.INVOKESTATIC));
+		}
+		
 		return startPos;
 	}
+
+	@Override
+	public void updateLabel() {
+		label = "cos(" + arg + ")";
+		sortKey = label;
+	}
 }
@@ -63,12 +63,12 @@ public InstructionHandle bytecodeGen(String clsName, MethodGen mg,
 			il.append(factory.createInvoke("symjava.symbolic.utils.BytecodeOpSupport", "sin",
 					new ObjectType("Jama.Matrix"), 
 					new Type[] { new ObjectType("Jama.Matrix") },
-			Constants.INVOKESTATIC));
+					Constants.INVOKESTATIC));
 		} else {
 			il.append(factory.createInvoke("java.lang.Math", "sin",
 					Type.DOUBLE, 
 					new Type[] { Type.DOUBLE },
-			Constants.INVOKESTATIC));
+					Constants.INVOKESTATIC));
 		}
 		return startPos;
 	}
 
@@ -37,6 +37,15 @@ public static Jama.Matrix abs(Jama.Matrix arg) {
 		return arg;
 	}
 
+	public static Jama.Matrix cos(Jama.Matrix arg) {
+		double[][] data = arg.getArray();
+		for(int i=0; i<data.length; i++) {
+			for(int j=0; j<data[0].length; j++) {
+				data[i][j] = Math.cos(data[i][j]);
+			}
+		}
+		return arg;
+	}
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub