diff --git a/Vector.java b/Vector.java index a54b330..600dc16 100644 --- a/Vector.java +++ b/Vector.java @@ -3,36 +3,30 @@ public class Vector { public static void scalarMultiplication(int[] vector, int scalar) { for (int position = 0; position < vector.length; position++) { - vector[position] *= scalar; } } public static void vectorProduct(int[] vector1, int[] vector2) { - if (vector1 == null || vector2 == null){ - System.out.println("Wegen unterschiedlichen Dimensionen ist das Kreuzprodukt nicht erlaubt"); - } - else if (vector1.length == vector2.length && vector2.length == 3) { + + if (vector1.length == vector2.length && vector2.length == 3) { int[] kreuzVektor3D = new int[3]; kreuzVektor3D[0] = (vector1[1] * vector2[2]) - (vector1[2] * vector2[1]); kreuzVektor3D[1] = (vector1[2] * vector2[0]) - (vector1[0] * vector2[2]); kreuzVektor3D[2] = (vector1[0] * vector2[1]) - (vector1[1] * vector2[0]); - System.out.println("Ergebnis des 3DKreuzproduktes: [" + kreuzVektor3D[0] + ", " + kreuzVektor3D[1] + ", " + System.out.println("Ergebnis des Kreuzproduktes: [" + kreuzVektor3D[0] + ", " + kreuzVektor3D[1] + ", " + kreuzVektor3D[2] + "]"); - } else if (vector1.length == vector2.length && vector2.length == 2) { int kreuzVektor2D = 0; kreuzVektor2D = (vector1[0] * vector2[1]) - (vector1[1] * vector2[0]); - System.out.println("Ergebnis des 2DKreuzproduktes: " + kreuzVektor2D); - + System.out.println("Ergebnis des Kreuzproduktes: " + kreuzVektor2D); } else { System.out.println("Wegen unterschiedlichen Dimensionen ist das Kreuzprodukt nicht erlaubt"); } - } public static double vectorLength(int[] vector) { @@ -40,7 +34,6 @@ public class Vector { double betrag = 0.0; for (int i = 0; i < vector.length; i++) { qSumme = qSumme + (vector[i] * vector[i]); - } betrag = Math.sqrt(qSumme); @@ -50,11 +43,7 @@ public class Vector { public static int[][] matrixMultiplication(int[][] matrix, int scalar) { int[][] ausgabe; - // boolean matrixFlag = false; - // if (matrix.length ==3 && matrix[0].length == 3 && matrix[1].length == 3 && - // matrix[2].length == 3){ - // matrixFlag =true; - // } + if (matrix == null){ ausgabe = null; }