Завершение большого переименования
This commit is contained in:
parent
120e651517
commit
3805354611
31 changed files with 1213 additions and 1255 deletions
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_workspace_file>
|
||||
<Workspace title="Workspace">
|
||||
<Project filename="basic-geometry/basic-geometry.cbp" />
|
||||
<Project filename="basic-geometry-dev/basic-geometry-dev.cbp">
|
||||
<Depends filename="basic-geometry/basic-geometry.cbp" />
|
||||
</Project>
|
||||
<Project filename="basic-geometry/basic-geometry.cbp" />
|
||||
<Project filename="basic-geometry-test/basic-geometry-test.cbp">
|
||||
<Depends filename="basic-geometry/basic-geometry.cbp" />
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
#endif // _WINDOWS_
|
||||
|
||||
typedef struct {
|
||||
versor_fp32_t versor1, versor2, result;
|
||||
bgc_versor_fp32_t versor1, versor2, result;
|
||||
//matrix3x3_fp32_t matrix;
|
||||
vector3_fp32_t vector1, vector2;
|
||||
bgc_vector3_fp32_t vector1, vector2;
|
||||
} structure_fp32_t;
|
||||
|
||||
structure_fp32_t* allocate_structures(const unsigned int amount)
|
||||
|
|
@ -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_set_values_fp32(
|
||||
bgc_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_set_values_fp32(
|
||||
bgc_versor_set_values_fp32(
|
||||
rand() * multiplier - 1.0f,
|
||||
rand() * multiplier - 1.0f,
|
||||
rand() * multiplier - 1.0f,
|
||||
|
|
@ -47,49 +47,49 @@ structure_fp32_t* make_structures(const unsigned int amount)
|
|||
&list[i].versor2
|
||||
);
|
||||
|
||||
versor_reset_fp32(&list[i].result);
|
||||
bgc_versor_reset_fp32(&list[i].result);
|
||||
|
||||
//matrix3x3_set_to_identity_fp32(&list[i].matrix);
|
||||
|
||||
vector3_set_values_fp32(
|
||||
bgc_vector3_set_values_fp32(
|
||||
rand() * multiplier - 1.0f,
|
||||
rand() * multiplier - 1.0f,
|
||||
rand() * multiplier - 1.0f,
|
||||
&list[i].vector1
|
||||
);
|
||||
|
||||
vector3_reset_fp32(&list[i].vector2);
|
||||
bgc_vector3_reset_fp32(&list[i].vector2);
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
void print_versor_fp32(const versor_fp32_t* versor)
|
||||
void print_versor_fp32(const bgc_versor_fp32_t* versor)
|
||||
{
|
||||
printf("Versor (%f, %f, %f, %f)\n", versor->s0, versor->x1, versor->x2, versor->x3);
|
||||
}
|
||||
|
||||
void print_versor_fp64(const versor_fp64_t* versor)
|
||||
void print_versor_fp64(const bgc_versor_fp64_t* versor)
|
||||
{
|
||||
printf("Versor (%lf, %lf, %lf, %lf)\n", versor->s0, versor->x1, versor->x2, versor->x3);
|
||||
}
|
||||
|
||||
void print_vector_fp32(const vector3_fp32_t* vector)
|
||||
void print_vector_fp32(const bgc_vector3_fp32_t* vector)
|
||||
{
|
||||
printf("(%f, %f, %f) / %f\n", vector->x1, vector->x2, vector->x3, vector3_get_modulus_fp32(vector));
|
||||
printf("(%f, %f, %f) / %f\n", vector->x1, vector->x2, vector->x3, bgc_vector3_get_modulus_fp32(vector));
|
||||
}
|
||||
|
||||
void print_vector_fp64(const vector3_fp64_t* vector)
|
||||
void print_vector_fp64(const bgc_vector3_fp64_t* vector)
|
||||
{
|
||||
printf("(%lf, %lf, %lf) / %lf\n", vector->x1, vector->x2, vector->x3, vector3_get_modulus_fp64(vector));
|
||||
printf("(%lf, %lf, %lf) / %lf\n", vector->x1, vector->x2, vector->x3, bgc_vector3_get_modulus_fp64(vector));
|
||||
}
|
||||
|
||||
void item_work(structure_fp32_t* item)
|
||||
{
|
||||
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);
|
||||
}
|
||||
//for (int j = 0; j < 1000; j++) {
|
||||
bgc_versor_combine_fp32(&item->versor1, &item->versor2, &item->result);
|
||||
bgc_versor_turn_vector_fp32(&item->result, &item->vector1, &item->vector2);
|
||||
//}
|
||||
}
|
||||
|
||||
int main()
|
||||
|
|
@ -125,8 +125,8 @@ int main()
|
|||
//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);
|
||||
//bgc_versor_combine_fp32(&item->versor1, &item->versor2, &item->result);
|
||||
//bgc_versor_turn_vector_fp32(&item->result, &item->vector1, &item->vector2);
|
||||
//}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
const int TEST_FP32_VECTOR2_AMOUNT_1 = 5;
|
||||
|
||||
const vector2_fp32_t TEST_FP32_VECTOR2_COMMON_1[] = {
|
||||
const bgc_vector2_fp32_t TEST_FP32_VECTOR2_COMMON_1[] = {
|
||||
{ 3.0f, 4.0f },
|
||||
{ -3.0f, -4.0f },
|
||||
{ 10000.0f, -20000.0f },
|
||||
|
|
@ -10,7 +10,7 @@ const vector2_fp32_t TEST_FP32_VECTOR2_COMMON_1[] = {
|
|||
{ -123.5f, 3.7283f }
|
||||
};
|
||||
|
||||
const vector2_fp32_t TEST_FP32_VECTOR2_COMMON_2[] = {
|
||||
const bgc_vector2_fp32_t TEST_FP32_VECTOR2_COMMON_2[] = {
|
||||
{ -3.0f, -4.0f },
|
||||
{ -3.0f, -4.0f },
|
||||
{ 0.002f, -0.05f },
|
||||
|
|
@ -29,9 +29,9 @@ int test_vector2_fp32_square_modulus()
|
|||
float 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]);
|
||||
square_modulus = bgc_vector2_get_square_modulus_fp32(&TEST_FP32_VECTOR2_COMMON_1[i]);
|
||||
|
||||
if (!test_are_equal_fp32(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_BGC_TWO_EPSYLON_FP32)) {
|
||||
print_test_failed();
|
||||
return TEST_RESULT_FAILED;
|
||||
}
|
||||
|
|
@ -52,9 +52,9 @@ int test_vector2_fp32_modulus()
|
|||
float square_modulus;
|
||||
|
||||
for (int i = 0; i < TEST_FP32_VECTOR2_AMOUNT_1; i++) {
|
||||
square_modulus = vector2_get_modulus_fp32(&TEST_FP32_VECTOR2_COMMON_1[i]);
|
||||
square_modulus = bgc_vector2_get_modulus_fp32(&TEST_FP32_VECTOR2_COMMON_1[i]);
|
||||
|
||||
if (!test_are_equal_fp32(square_modulus, FP32_VECTOR2_MODULUS_1[i], TEST_FP32_EPSYLON)) {
|
||||
if (!test_are_equal_fp32(square_modulus, FP32_VECTOR2_MODULUS_1[i], TEST_BGC_EPSYLON_FP32)) {
|
||||
print_test_failed();
|
||||
return TEST_RESULT_FAILED;
|
||||
}
|
||||
|
|
@ -66,7 +66,7 @@ int test_vector2_fp32_modulus()
|
|||
|
||||
// ===================== Add ==================== //
|
||||
|
||||
const vector2_fp32_t TEST_FP32_VECTOR2_COMMON_1_2_SUM[] = {
|
||||
const bgc_vector2_fp32_t TEST_FP32_VECTOR2_COMMON_1_2_SUM[] = {
|
||||
{ 0.0f, 0.0f },
|
||||
{ -6.0f, -8.0f },
|
||||
{ 10000.002f, -20000.05f },
|
||||
|
|
@ -78,13 +78,13 @@ int test_vector2_add_fp32()
|
|||
{
|
||||
print_test_name("vector2_fp32_t add");
|
||||
|
||||
vector2_fp32_t vector;
|
||||
bgc_vector2_fp32_t vector;
|
||||
|
||||
for (int i = 0; i < TEST_FP32_VECTOR2_AMOUNT_1; i++) {
|
||||
vector2_add_fp32(&TEST_FP32_VECTOR2_COMMON_1[i], &TEST_FP32_VECTOR2_COMMON_2[i], &vector);
|
||||
bgc_vector2_add_fp32(&TEST_FP32_VECTOR2_COMMON_1[i], &TEST_FP32_VECTOR2_COMMON_2[i], &vector);
|
||||
|
||||
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)) {
|
||||
if (!test_are_equal_fp32(vector.x1, TEST_FP32_VECTOR2_COMMON_1_2_SUM[i].x1, TEST_BGC_EPSYLON_FP32) ||
|
||||
!test_are_equal_fp32(vector.x2, TEST_FP32_VECTOR2_COMMON_1_2_SUM[i].x2, TEST_BGC_EPSYLON_FP32)) {
|
||||
print_test_failed();
|
||||
return TEST_RESULT_FAILED;
|
||||
}
|
||||
|
|
@ -96,7 +96,7 @@ int test_vector2_add_fp32()
|
|||
|
||||
// ================== Subtract ================== //
|
||||
|
||||
const vector2_fp32_t TEST_FP32_VECTOR2_COMMON_1_2_DIFF[] = {
|
||||
const bgc_vector2_fp32_t TEST_FP32_VECTOR2_COMMON_1_2_DIFF[] = {
|
||||
{ 6.0f, 8.0f },
|
||||
{ 0.0f, 0.0f },
|
||||
{ 9999.998f, -19999.95f },
|
||||
|
|
@ -108,13 +108,13 @@ int test_vector2_subtract_fp32()
|
|||
{
|
||||
print_test_name("vector2_fp32_t subtract");
|
||||
|
||||
vector2_fp32_t vector;
|
||||
bgc_vector2_fp32_t vector;
|
||||
|
||||
for (int i = 0; i < TEST_FP32_VECTOR2_AMOUNT_1; i++) {
|
||||
vector2_subtract_fp32(&TEST_FP32_VECTOR2_COMMON_1[i], &TEST_FP32_VECTOR2_COMMON_2[i], &vector);
|
||||
bgc_vector2_subtract_fp32(&TEST_FP32_VECTOR2_COMMON_1[i], &TEST_FP32_VECTOR2_COMMON_2[i], &vector);
|
||||
|
||||
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)) {
|
||||