1720808
/
PR1_Pflicht_3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: löschung von leern Zeilen

main
Andreas Wurst 2025-05-20 11:35:19 +02:00
parent 87fc879292
commit 2a4a347108
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Vector.java
View File

@ -3,36 +3,30 @@ public class Vector {
public static void scalarMultiplication(int[] vector, int scalar) { public static void scalarMultiplication(int[] vector, int scalar) {
for (int position = 0; position < vector.length; position++) { for (int position = 0; position < vector.length; position++) {
vector[position] *= scalar; vector[position] *= scalar;
} }
} }
public static void vectorProduct(int[] vector1, int[] vector2) { public static void vectorProduct(int[] vector1, int[] vector2) {
if (vector1 == null || vector2 == null){
System.out.println("Wegen unterschiedlichen Dimensionen ist das Kreuzprodukt nicht erlaubt"); if (vector1.length == vector2.length && vector2.length == 3) {
}
else if (vector1.length == vector2.length && vector2.length == 3) {
int[] kreuzVektor3D = new int[3]; int[] kreuzVektor3D = new int[3];
kreuzVektor3D[0] = (vector1[1] * vector2[2]) - (vector1[2] * vector2[1]); kreuzVektor3D[0] = (vector1[1] * vector2[2]) - (vector1[2] * vector2[1]);
kreuzVektor3D[1] = (vector1[2] * vector2[0]) - (vector1[0] * vector2[2]); kreuzVektor3D[1] = (vector1[2] * vector2[0]) - (vector1[0] * vector2[2]);
kreuzVektor3D[2] = (vector1[0] * vector2[1]) - (vector1[1] * vector2[0]); 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] + "]"); + kreuzVektor3D[2] + "]");
} }
else if (vector1.length == vector2.length && vector2.length == 2) { else if (vector1.length == vector2.length && vector2.length == 2) {
int kreuzVektor2D = 0; int kreuzVektor2D = 0;
kreuzVektor2D = (vector1[0] * vector2[1]) - (vector1[1] * vector2[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 { else {
System.out.println("Wegen unterschiedlichen Dimensionen ist das Kreuzprodukt nicht erlaubt"); System.out.println("Wegen unterschiedlichen Dimensionen ist das Kreuzprodukt nicht erlaubt");
} }
} }
public static double vectorLength(int[] vector) { public static double vectorLength(int[] vector) {
@ -40,7 +34,6 @@ public class Vector {
double betrag = 0.0; double betrag = 0.0;
for (int i = 0; i < vector.length; i++) { for (int i = 0; i < vector.length; i++) {
qSumme = qSumme + (vector[i] * vector[i]); qSumme = qSumme + (vector[i] * vector[i]);
} }
betrag = Math.sqrt(qSumme); betrag = Math.sqrt(qSumme);
@ -50,11 +43,7 @@ public class Vector {
public static int[][] matrixMultiplication(int[][] matrix, int scalar) { public static int[][] matrixMultiplication(int[][] matrix, int scalar) {
int[][] ausgabe; 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){ if (matrix == null){
ausgabe = null; ausgabe = null;
} }