Продолжение переименования

This commit is contained in:
Andrey Pokidov 2025-01-15 03:37:48 +07:00
parent 3b6efaafa9
commit 120e651517
19 changed files with 457 additions and 421 deletions

View file

@ -11,7 +11,7 @@
typedef struct {
versor_fp32_t versor1, versor2, result;
matrix3x3_fp32_t matrix;
//matrix3x3_fp32_t matrix;
vector3_fp32_t vector1, vector2;
} structure_fp32_t;
@ -31,7 +31,7 @@ structure_fp32_t* make_structures(const unsigned int amount)
const float multiplier = 2.0f / RAND_MAX;
for (unsigned int i = 0; i < amount; i++) {
versor_fp32_set_values(
versor_set_values_fp32(
rand() * multiplier - 1.0f,
rand() * multiplier - 1.0f,
rand() * multiplier - 1.0f,
@ -39,7 +39,7 @@ structure_fp32_t* make_structures(const unsigned int amount)
&list[i].versor1
);
versor_fp32_set_values(
versor_set_values_fp32(
rand() * multiplier - 1.0f,
rand() * multiplier - 1.0f,
rand() * multiplier - 1.0f,
@ -49,9 +49,9 @@ structure_fp32_t* make_structures(const unsigned int amount)
versor_reset_fp32(&list[i].result);
matrix3x3_fp32_set_to_identity(&list[i].matrix);
//matrix3x3_set_to_identity_fp32(&list[i].matrix);
vector3_set_fp32(
vector3_set_values_fp32(
rand() * multiplier - 1.0f,
rand() * multiplier - 1.0f,
rand() * multiplier - 1.0f,
@ -86,9 +86,10 @@ void print_vector_fp64(const vector3_fp64_t* vector)
void item_work(structure_fp32_t* item)
{
versor_fp32_combine(&item->versor1, &item->versor1, &item->result);
versor_fp32_make_rotation_matrix(&item->result, &item->matrix);
matrix3x3_fp32_right_product(&item->matrix, &item->vector1, &item->vector2);
for (int j = 0; j < 1000; j++) {
versor_combine_fp32(&item->versor1, &item->versor2, &item->result);
versor_turn_vector_fp32(&item->result, &item->vector1, &item->vector2);
}
}
int main()
@ -121,13 +122,12 @@ int main()
#endif // _WIN64
for (unsigned int i = 0; i < amount; i++) {
for (int j = 0; j < 1000; j++) {
//item_work(list + i);
versor_fp32_combine(&list[i].versor1, &list[i].versor2, &list[i].result);
versor_fp32_make_rotation_matrix(&list[i].result, &list[i].matrix);
matrix3x3_fp32_right_product(&list[i].matrix, &list[i].vector1, &list[i].vector2);
//versor_fp32_turn(&list[i].result, &list[i].vector1, &list[i].vector2);
}
//for (int j = 0; j < 1000; j++) {
item_work(list + i);
//structure_fp32_t* item = list + i;
//versor_combine_fp32(&item->versor1, &item->versor2, &item->result);
//versor_turn_vector_fp32(&item->result, &item->vector1, &item->vector2);
//}
}
#ifdef _WIN64

View file

@ -1,4 +1,4 @@
#include "vector2_fp32_test.h"
#include "fp32_vector2_test.h"
const int TEST_FP32_VECTOR2_AMOUNT_1 = 5;
@ -31,7 +31,7 @@ int test_vector2_fp32_square_modulus()
for (int i = 0; i < TEST_FP32_VECTOR2_AMOUNT_1; i++) {
square_modulus = vector2_get_square_modulus_fp32(&TEST_FP32_VECTOR2_COMMON_1[i]);
if (!test_fp32_are_equal(square_modulus, FP32_VECTOR2_SQUARE_MODULUS_1[i], TEST_FP32_TWO_EPSYLON)) {
if (!test_are_equal_fp32(square_modulus, FP32_VECTOR2_SQUARE_MODULUS_1[i], TEST_FP32_TWO_EPSYLON)) {
print_test_failed();
return TEST_RESULT_FAILED;
}
@ -54,7 +54,7 @@ int test_vector2_fp32_modulus()
for (int i = 0; i < TEST_FP32_VECTOR2_AMOUNT_1; i++) {
square_modulus = vector2_get_modulus_fp32(&TEST_FP32_VECTOR2_COMMON_1[i]);
if (!test_fp32_are_equal(square_modulus, FP32_VECTOR2_MODULUS_1[i], TEST_FP32_EPSYLON)) {
if (!test_are_equal_fp32(square_modulus, FP32_VECTOR2_MODULUS_1[i], TEST_FP32_EPSYLON)) {
print_test_failed();
return TEST_RESULT_FAILED;
}
@ -74,17 +74,17 @@ const vector2_fp32_t TEST_FP32_VECTOR2_COMMON_1_2_SUM[] = {
{ -122.0f, -19.6217f }
};
int test_vector2_fp32_add()
int test_vector2_add_fp32()
{
print_test_name("vector2_fp32_t add");
vector2_fp32_t vector;
for (int i = 0; i < TEST_FP32_VECTOR2_AMOUNT_1; i++) {
vector2_fp32_add(&TEST_FP32_VECTOR2_COMMON_1[i], &TEST_FP32_VECTOR2_COMMON_2[i], &vector);
vector2_add_fp32(&TEST_FP32_VECTOR2_COMMON_1[i], &TEST_FP32_VECTOR2_COMMON_2[i], &vector);
if (!test_fp32_are_equal(vector.x1, TEST_FP32_VECTOR2_COMMON_1_2_SUM[i].x1, TEST_FP32_EPSYLON) ||
!test_fp32_are_equal(vector.x2, TEST_FP32_VECTOR2_COMMON_1_2_SUM[i].x2, TEST_FP32_EPSYLON)) {
if (!test_are_equal_fp32(vector.x1, TEST_FP32_VECTOR2_COMMON_1_2_SUM[i].x1, TEST_FP32_EPSYLON) ||
!test_are_equal_fp32(vector.x2, TEST_FP32_VECTOR2_COMMON_1_2_SUM[i].x2, TEST_FP32_EPSYLON)) {
print_test_failed();
return TEST_RESULT_FAILED;
}
@ -104,17 +104,17 @@ const vector2_fp32_t TEST_FP32_VECTOR2_COMMON_1_2_DIFF[] = {
{ -125.0f, 27.0783f }
};
int test_vector2_fp32_subtract()
int test_vector2_subtract_fp32()
{
print_test_name("vector2_fp32_t subtract");
vector2_fp32_t vector;
for (int i = 0; i < TEST_FP32_VECTOR2_AMOUNT_1; i++) {
vector2_fp32_subtract(&TEST_FP32_VECTOR2_COMMON_1[i], &TEST_FP32_VECTOR2_COMMON_2[i], &vector);
vector2_subtract_fp32(&TEST_FP32_VECTOR2_COMMON_1[i], &TEST_FP32_VECTOR2_COMMON_2[i], &vector);
if (!test_fp32_are_equal(vector.x1, TEST_FP32_VECTOR2_COMMON_1_2_DIFF[i].x1, TEST_FP32_EPSYLON) ||
!test_fp32_are_equal(vector.x2, TEST_FP32_VECTOR2_COMMON_1_2_DIFF[i].x2, TEST_FP32_EPSYLON)) {
if (!test_are_equal_fp32(vector.x1, TEST_FP32_VECTOR2_COMMON_1_2_DIFF[i].x1, TEST_FP32_EPSYLON) ||
!test_are_equal_fp32(vector.x2, TEST_FP32_VECTOR2_COMMON_1_2_DIFF[i].x2, TEST_FP32_EPSYLON)) {
print_test_failed();
return TEST_RESULT_FAILED;
}
@ -138,11 +138,11 @@ int test_fp32_vector2()
return TEST_RESULT_FAILED;
}
if (test_vector2_fp32_add() != TEST_RESULT_SUCCES) {
if (test_vector2_add_fp32() != TEST_RESULT_SUCCES) {
return TEST_RESULT_FAILED;
}
if (test_vector2_fp32_subtract() != TEST_RESULT_SUCCES) {
if (test_vector2_subtract_fp32() != TEST_RESULT_SUCCES) {
return TEST_RESULT_FAILED;
}

View file

@ -9,8 +9,8 @@ int test_vector2_fp32_square_modulus();
int test_vector2_fp32_modulus();
int test_vector2_fp32_add();
int test_vector2_add_fp32();
int test_vector2_fp32_subtract();
int test_vector2_subtract_fp32();
#endif

View file

@ -22,7 +22,7 @@ void print_test_success();
void print_test_failed();
inline int test_fp32_are_equal(const float value1, const float value2, const float epsylon)
inline int test_are_equal_fp32(const float value1, const float value2, const float epsylon)
{
if (-1.0f <= value1 && value1 <= 1.0f) {
const float difference = value1 - value2;
@ -36,7 +36,7 @@ inline int test_fp32_are_equal(const float value1, const float value2, const flo
return value1 * (1.0f + epsylon) <= value2 && value2 * (1.0f + epsylon) <= value1;
}
inline int test_fp64_are_equal(const double value1, const double value2, const double epsylon)
inline int test_are_equal_fp64(const double value1, const double value2, const double epsylon)
{
if (-1.0 <= value1 && value1 <= 1.0) {
const double difference = value1 - value2;

View file

@ -2,7 +2,7 @@
#include <stdlib.h>
#include "geometry_test.h"
#include "vector2_fp32_test.h"
#include "fp32_vector2_test.h"
#define PROGRAM_RESULT_SUCCESS 0
#define PROGRAM_RESULT_FAILED 1

View file

Internal server error - Personal Git Server: Beyond coding. We Forge.

500

Internal server error

Forgejo version: 11.0.1+gitea-1.22.0

@ -25,7 +25,7 @@ inline void matrix2x2_reset_fp64(matrix2x2_fp64_t* matrix)
// ================== Identity ================== //
inline void matrix2x2_fp32_set_to_identity(matrix2x2_fp32_t* matrix)
inline void matrix2x2_set_to_identity_fp32(matrix2x2_fp32_t* matrix)
{
matrix->r1c1 = 1.0f;
matrix->r1c2 = 0.0f;
@ -33,7 +33,7 @@ inline void matrix2x2_fp32_set_to_identity(matrix2x2_fp32_t* matrix)
matrix->r2c2 = 1.0f;
}
inline void matrix2x2_fp64_set_to_identity(matrix2x2_fp64_t* matrix)
inline void matrix2x2_set_to_identity_fp64(matrix2x2_fp64_t* matrix)
{
matrix->r1c1 = 1.0;
matrix->r1c2 = 0.0;
@ -43,7 +43,7 @@ inline void matrix2x2_fp64_set_to_identity(matrix2x2_fp64_t* matrix)
// ================ Make Diagonal =============== //
inline void matrix2x2_fp32_set_to_diagonal(const float d1, const float d2, matrix2x2_fp32_t* matrix)
inline void matrix2x2_set_to_diagonal_fp32(const float d1, const float d2, matrix2x2_fp32_t* matrix)
{
matrix->r1c1 = d1;
matrix->r1c2 = 0.0f;
@ -51,7 +51,7 @@ inline void matrix2x2_fp32_set_to_diagonal(const float d1, const float d2, matri
matrix->r2c2 = d2;
}
inline void matrix2x2_fp64_set_to_diagonal(const double d1, const double d2, matrix2x2_fp64_t* matrix)
inline void matrix2x2_set_to_diagonal_fp64(const double d1, const double d2, matrix2x2_fp64_t* matrix)
{
matrix->r1c1 = d1;
matrix->r1c2 = 0.0;
@ -61,7 +61,7 @@ inline void matrix2x2_fp64_set_to_diagonal(const double d1, const double d2, mat
// ============== Rotation Matrix =============== //
inline void matrix2x2_fp32_make_turn(const float angle, const angle_unit_t unit, matrix2x2_fp32_t* matrix)
inline void matrix2x2_make_rotation_fp32(const float angle, const angle_unit_t unit, matrix2x2_fp32_t* matrix)
{
const float radians = fp32_angle_to_radians(angle, unit);
const float cosine = cosf(radians);
@ -73,7 +73,7 @@ inline void matrix2x2_fp32_make_turn(const float angle, const angle_unit_t unit,
matrix->r2c2 = cosine;
}
inline void matrix2x2_fp64_make_turn(const double angle, const angle_unit_t unit, matrix2x2_fp64_t* matrix)
inline void matrix2x2_make_rotation_fp64(const double angle, const angle_unit_t unit, matrix2x2_fp64_t* matrix)
{
const double radians = fp64_angle_to_radians(angle, unit);
const double cosine = cos(radians);
@ -151,7 +151,7 @@ inline void matrix2x2_swap_fp64(matrix2x2_fp64_t* matrix1, matrix2x2_fp64_t* mat
// ============= Copy to twin type ============== //
inline void matrix2x2_fp32_set_from_fp64(const matrix2x2_fp64_t* from, matrix2x2_fp32_t* to)
inline void matrix2x2_convert_fp64_to_fp32(const matrix2x2_fp64_t* from, matrix2x2_fp32_t* to)
{
to->r1c1 = (float)from->r1c1;
to->r1c2 = (float)from->r1c2;
@ -160,7 +160,7 @@ inline void matrix2x2_fp32_set_from_fp64(const matrix2x2_fp64_t* from, matrix2x2
to->r2c2 = (float)from->r2c2;
}
inline void matrix2x2_fp64_set_from_fp32(const matrix2x2_fp32_t* from, matrix2x2_fp64_t* to)
inline void matrix2x2_convert_fp32_to_fp64(const matrix2x2_fp32_t* from, matrix2x2_fp64_t* to)
{
to->r1c1 = from->r1c1;
to->r1c2 = from->r1c2;
@ -171,42 +171,42 @@ inline void matrix2x2_fp64_set_from_fp32(const matrix2x2_fp32_t* from, matrix2x2
// ================ Determinant ================= //
inline float matrix2x2_fp32_get_determinant(const matrix2x2_fp32_t* matrix)
inline float matrix2x2_get_determinant_fp32(const matrix2x2_fp32_t* matrix)
{
return matrix->r1c1 * matrix->r2c2 - matrix->r1c2 * matrix->r2c1;
}
inline double matrix2x2_fp64_get_determinant(const matrix2x2_fp64_t* matrix)
inline double matrix2x2_get_determinant_fp64(const matrix2x2_fp64_t* matrix)
{
return matrix->r1c1 * matrix->r2c2 - matrix->r1c2 * matrix->r2c1;
}
// ================== Singular ================== //
inline int matrix2x2_fp32_is_singular(const matrix2x2_fp32_t* matrix)
inline int matrix2x2_is_singular_fp32(const matrix2x2_fp32_t* matrix)
{
const float determinant = matrix2x2_fp32_get_determinant(matrix);
const float determinant = matrix2x2_get_determinant_fp32(matrix);
return -FP32_EPSYLON <= determinant && determinant <= FP32_EPSYLON;
}
inline int matrix2x2_fp64_is_singular(const matrix2x2_fp64_t* matrix)
inline int matrix2x2_is_singular_fp64(const matrix2x2_fp64_t* matrix)
{
const double determinant = matrix2x2_fp64_get_determinant(matrix);
const double determinant = matrix2x2_get_determinant_fp64(matrix);
return -FP64_EPSYLON <= determinant && determinant <= FP64_EPSYLON;
}
// =============== Transposition ================ //
inline void matrix2x2_fp32_transpose(matrix2x2_fp32_t* matrix)
inline void matrix2x2_transpose_fp32(matrix2x2_fp32_t* matrix)
{
const float tmp = matrix->r1c2;
matrix->r1c2 = matrix->r2c1;
matrix->r2c1 = tmp;
}
inline void matrix2x2_fp64_transpose(matrix2x2_fp64_t* matrix)
inline void matrix2x2_transpose_fp64(matrix2x2_fp64_t* matrix)
{
const double tmp = matrix->r1c2;
matrix->r1c2 = matrix->r2c1;
@ -217,7 +217,7 @@ inline void matrix2x2_fp64_transpose(matrix2x2_fp64_t* matrix)
inline int matrix2x2_invert_fp32(matrix2x2_fp32_t* matrix)
{
const float determinant = matrix2x2_fp32_get_determinant(matrix);
const float determinant = matrix2x2_get_determinant_fp32(matrix);
if (-FP32_EPSYLON <= determinant && determinant <= FP32_EPSYLON) {
return 0;
@ -242,7 +242,7 @@ inline int matrix2x2_invert_fp32(matrix2x2_fp32_t* matrix)
inline int matrix2x2_invert_fp64(matrix2x2_fp64_t* matrix)
{
const double determinant = matrix2x2_fp64_get_determinant(matrix);
const double determinant = matrix2x2_get_determinant_fp64(matrix);
if (-FP64_EPSYLON <= determinant && determinant <= FP64_EPSYLON) {
return 0;
@ -267,7 +267,7 @@ inline int matrix2x2_invert_fp64(matrix2x2_fp64_t* matrix)
// =============== Set Transposed =============== //
inline void matrix2x2_fp32_set_transposed(const matrix2x2_fp32_t* from, matrix2x2_fp32_t* to)
inline void matrix2x2_set_transposed_fp32(const matrix2x2_fp32_t* from, matrix2x2_fp32_t* to)
{
float tmp = from->r1c2;
@ -278,7 +278,7 @@ inline void matrix2x2_fp32_set_transposed(const matrix2x2_fp32_t* from, matrix2x
to->r2c2 = from->r2c2;
}
inline void matrix2x2_fp64_set_transposed(const matrix2x2_fp64_t* from, matrix2x2_fp64_t* to)
inline void matrix2x2_set_transposed_fp64(const matrix2x2_fp64_t* from, matrix2x2_fp64_t* to)
{
double tmp = from->r1c2;
@ -291,9 +291,9 @@ inline void matrix2x2_fp64_set_transposed(const matrix2x2_fp64_t* from, matrix2x
// ================ Set Inverted ================ //
inline int matrix2x2_fp32_set_inverted(const matrix2x2_fp32_t* from, matrix2x2_fp32_t* to)
inline int matrix2x2_set_inverted_fp32(const matrix2x2_fp32_t* from, matrix2x2_fp32_t* to)
{
const float determinant = matrix2x2_fp32_get_determinant(from);
const float determinant = matrix2x2_get_determinant_fp32(from);
if (-FP32_EPSYLON <= determinant && determinant <= FP32_EPSYLON) {
return 0;
@ -316,9 +316,9 @@ inline int matrix2x2_fp32_set_inverted(const matrix2x2_fp32_t* from, matrix2x2_f
return 1;
}
inline int matrix2x2_fp64_set_inverted(const matrix2x2_fp64_t* from, matrix2x2_fp64_t* to)
inline int matrix2x2_set_inverted_fp64(const matrix2x2_fp64_t* from, matrix2x2_fp64_t* to)
{
const double determinant = matrix2x2_fp64_get_determinant(from);
const double determinant = matrix2x2_get_determinant_fp64(from);
if (-FP64_EPSYLON <= determinant && determinant <= FP64_EPSYLON) {
return 0;
@ -343,13 +343,13 @@ inline int matrix2x2_fp64_set_inverted(const matrix2x2_fp64_t* from, matrix2x2_f
// ================= Set Row 1 ================== //
inline void matrix2x2_fp32_set_row1(const float c1, const float c2, matrix2x2_fp32_t* matrix)
inline void matrix2x2_set_row1_fp32(const float c1, const float c2, matrix2x2_fp32_t* matrix)
{
matrix->r1c1 = c1;
matrix->r1c2 = c2;
}
inline void matrix2x2_fp64_set_row1(const double c1, const double c2, matrix2x2_fp64_t* matrix)
inline void matrix2x2_set_row1_fp64(const double c1, const double c2, matrix2x2_fp64_t* matrix)
{
matrix->r1c1 = c1;
matrix->r1c2 = c2;
@ -357,13 +357,13 @@ inline void matrix2x2_fp64_set_row1(const double c1, const double c2, matrix2x2_
// ================= Set Row 2 ================== //
inline void matrix2x2_fp32_set_row2(const float c1, const float c2, matrix2x2_fp32_t* matrix)
inline void matrix2x2_set_row2_fp32(const float c1, const float c2, matrix2x2_fp32_t* matrix)
{
matrix->r2c1 = c1;
matrix->r2c2 = c2;
}
inline void matrix2x2_fp64_set_row2(const double c1, const double c2, matrix2x2_fp64_t* matrix)
inline void matrix2x2_set_row2_fp64(const double c1, const double c2, matrix2x2_fp64_t* matrix)
{
matrix->r2c1 = c1;
matrix->r2c2 = c2;
@ -371,13 +371,13 @@ inline void matrix2x2_fp64_set_row2(const double c1, const double c2, matrix2x2_
// ================ Set Column 1 ================ //
inline void matrix2x2_fp32_set_column1(const float r1, const float r2, matrix2x2_fp32_t* matrix)