Commit: 6 - iPat_0.7.0 (svn)

Commit MetaInfo

• Revision: 6 (tree)
• Time: 2013-11-12 17:06:56
• Author: evakichi

Log Message

missing

Change Summary

• delete: java/src/graph
• delete: java/src/math/Matrix.java
• delete: java/src/math/Frac.java
• delete: java/src/math/Tips.java
• delete: java/src/math/Test.java
• delete: java/src/math
• delete: java/src
• delete: java
• delete: site-lisp

Incremental Difference

--- java/src/math/Frac.java	(revision 5)
+++ java/src/math/Frac.java	(nonexistent)
@@ -1,64 +0,0 @@
-/**
- * 
- */
-package math;
-
-/**
- * @author ishihara
- *
- */
-public class Frac {
-	private int numerator;
-	private int denominator;
-
-	public Frac(int numerator)
-	{
-		this(numerator,1);
-	}
-	
-	public Frac(int numerator, int denominator)
-	{
-		this.numerator=numerator;
-		this.denominator=denominator;
-		reduction();
-	}
-	
-	public static Frac plus(Frac f1,Frac f2)
-	{
-		return new Frac(f1.getNumerator()*f2.getDenominator()+f1.getDenominator()*f2.getNumerator(),f1.getDenominator()*f2.getDenominator());
-	}
-
-	public static Frac minus(Frac f1,Frac f2)
-	{
-		return new Frac(f1.getNumerator()*f2.getDenominator()-f1.getDenominator()*f2.getNumerator(),f1.getDenominator()*f2.getDenominator());
-	}
-	
-	public static Frac mult(Frac f1,Frac f2)
-	{
-		return new Frac(f1.getNumerator()*f2.getNumerator(),f1.getDenominator()*f2.getDenominator());
-	}
-
-	public static Frac div(Frac f1,Frac f2)
-	{
-		return new Frac(f1.getNumerator()*f2.getDenominator(),f1.getDenominator()*f2.getNumerator());
-	}
-	
-	private int getNumerator(){return this.numerator;}
-	private int getDenominator(){return this.denominator;}
-
-	public void printFrac(){System.out.println(this.numerator+"/"+this.denominator);}
-	
-	private void reduction()
-	{
-		int g = Tips.gcd(this.numerator, this.denominator);
-		try
-		{
-			this.numerator=this.numerator*(this.denominator/Math.abs(this.denominator))/g;
-			this.denominator=this.denominator*(this.denominator/Math.abs(this.denominator))/g;		
-		}catch(ArithmeticException e)
-		{
-			System.out.println("DIV 0!!");
-		}
-	}
-	
-}

--- java/src/math/Tips.java	(revision 5)
+++ java/src/math/Tips.java	(nonexistent)
@@ -1,25 +0,0 @@
-/**
- * 
- */
-package math;
-
-/**
- * @author ishihara
- *
- */
-public class Tips {
-	public static int gcd(int n1,int n2)
-	{
-		int m=Math.max(Math.abs(n1), Math.abs(n2));
-		int n=Math.min(Math.abs(n1), Math.abs(n2));
-		if (n==0)
-			return m;
-		int l=m%n;		
-		if(l==0)
-			return n;
-		else		
-			return Tips.gcd(l, n);
-	}
-	
-
-}

--- java/src/math/Test.java	(revision 5)
+++ java/src/math/Test.java	(nonexistent)
@@ -1,36 +0,0 @@
-/**
- * 
- */
-package math;
-
-/**
- * @author ishihara
- *
- */
-public class Test {
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		// TODO 自動生成されたメソッド・スタブ
-		Frac f1 = new Frac(-3);
-		f1.printFrac();
-		Frac f2 = new Frac(2,3);
-		f2.printFrac();
-		Frac f3 = Frac.plus(f1, f2);
-		f3.printFrac();
-		Frac f4 = Frac.minus(f1, f2);
-		f4.printFrac();
-		Frac f5 = Frac.mult(f1, f2);
-		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/Matrix.java	(revision 5)
+++ java/src/math/Matrix.java	(nonexistent)
@@ -1,54 +0,0 @@
-/**
- * 
- */
-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;
-	}
-}