Commit: 4 - iPat_0.7.0 (svn)

Commit MetaInfo

• Revision: 4 (tree)
• Time: 2013-11-12 10:53:40
• Author: evakichi

Log Message

Add Matrix.java

Change Summary

• modified: java/src/math/Test.java
• modified: java/src/math/Tips.java
• added: java/src/math/Matrix.java

Incremental Difference

--- java/src/math/Test.java	(revision 3)
+++ java/src/math/Test.java	(revision 4)
@@ -26,6 +26,11 @@
 		f5.printFrac();
 		Frac f6 = Frac.div(f1, f2);
 		f6.printFrac();
+		int a[]={1,2,3};
+		int b[][]={{1,2,3},{2,3,4},{3,4,5}};
+		Matrix.printVector(Matrix.multMatrix(a, b));
+		Matrix.printMatrix(Matrix.multMatrix(b, b));
+		
 	}
 
 }

--- java/src/math/Tips.java	(revision 3)
+++ java/src/math/Tips.java	(revision 4)
@@ -20,4 +20,6 @@
 		else		
 			return Tips.gcd(l, n);
 	}
+	
+
 }

--- java/src/math/Matrix.java	(nonexistent)
+++ java/src/math/Matrix.java	(revision 4)
@@ -0,0 +1,54 @@
+/**
+ * 
+ */
+package math;
+
+/**
+ * @author ishihara
+ *
+ */
+public class Matrix {
+	public static void printVector(int[] v)
+	{
+		for(int i=0;i<v.length;i++)
+			System.out.print(v[i]+" ");
+		System.out.println();
+	}
+	public static void printMatrix(int[][] m)
+	{
+		for(int i=0;i<m.length;i++)
+		{
+			for(int j=0;j<m[i].length;j++)
+				System.out.print(m[i][j]+" ");
+			System.out.println();
+		}
+		System.out.println();
+	}
+
+	public static int[] multMatrix(int a[],int b[][])
+	{
+		int c[]=new int[a.length];
+		for(int i=0;i<a.length;i++)
+		{
+			c[i]=0;
+			for(int j=0;j<b.length;j++)
+			{
+				c[i]+=a[j]*b[j][i];
+			}
+		}	
+		return c;
+	}
+
+	public static int[][] multMatrix(int a[][],int b[][])
+	{
+		int c[][]=new int[a.length][b[0].length];
+		for(int i=0;i<a.length;i++)
+			for(int j=0;j<b.length;j++)
+			{
+				c[i][j]=0;
+				for(int k=0;k<b[i].length;k++)
+					c[i][j]+=a[i][k]*b[k][j];
+			}
+		return c;
+	}
+}