From f6461359b1ff73b5557a6fd930f2e200e3ef6399 Mon Sep 17 00:00:00 2001 From: PedroJJimenez Date: Mon, 25 Nov 2024 12:05:37 +0100 Subject: [PATCH 1/2] merge completed --- math_library.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/math_library.py b/math_library.py index 8bdda0c..a9989cc 100644 --- a/math_library.py +++ b/math_library.py @@ -2,6 +2,7 @@ def scalar_product(vector1, vector2): if len(vector1) != len(vector2): raise ValueError("Vectors must be of the same length") return sum(x * y for x, y in zip(vector1, vector2)) + def matrix_product(matrix1, matrix2): if len(matrix1[0]) != len(matrix2): raise ValueError("Number of columns in the first matrix must be equal to the number of rows in the second matrix") @@ -14,6 +15,7 @@ def matrix_product(matrix1, matrix2): result[i][j] += matrix1[i][k] * matrix2[k][j] return result + def vector_product(vector1, vector2): if len(vector1) != 3 or len(vector2) != 3: raise ValueError("Both vectors must be of length 3") From 91516b4f84133b3472ebfe7eae01511d221e12b5 Mon Sep 17 00:00:00 2001 From: Pedro Jimenez Date: Mon, 25 Nov 2024 12:06:24 +0100 Subject: [PATCH 2/2] Update math_library.py --- math_library.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/math_library.py b/math_library.py index a9989cc..9aee21f 100644 --- a/math_library.py +++ b/math_library.py @@ -3,6 +3,15 @@ def scalar_product(vector1, vector2): raise ValueError("Vectors must be of the same length") return sum(x * y for x, y in zip(vector1, vector2)) +def vector_product(vector1, vector2): + if len(vector1) != 3 or len(vector2) != 3: + raise ValueError("Both vectors must be of length 3") + return [ + vector1[1] * vector2[2] - vector1[2] * vector2[1], + vector1[2] * vector2[0] - vector1[0] * vector2[2], + vector1[0] * vector2[1] - vector1[1] * vector2[0] + ] + def matrix_product(matrix1, matrix2): if len(matrix1[0]) != len(matrix2): raise ValueError("Number of columns in the first matrix must be equal to the number of rows in the second matrix") @@ -15,12 +24,3 @@ def matrix_product(matrix1, matrix2): result[i][j] += matrix1[i][k] * matrix2[k][j] return result - -def vector_product(vector1, vector2): - if len(vector1) != 3 or len(vector2) != 3: - raise ValueError("Both vectors must be of length 3") - return [ - vector1[1] * vector2[2] - vector1[2] * vector2[1], - vector1[2] * vector2[0] - vector1[0] * vector2[2], - vector1[0] * vector2[1] - vector1[1] * vector2[0] - ]