nikola/diplomska_naloga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug getValue didnt return proper values

Browse Source
This commit is contained in:
Nikola Petrov 2025-01-31 17:23:23 +01:00
parent 35a646d3e8
commit c84f02c1e8
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/inc/values/mrand.hpp
View File

@ -12,6 +12,6 @@ namespace mrand
{
uint128 getState(uint64_t seed);
float getFloat(uint128 *state);
int getValue(int min, int max, uint128 *state);
int getValue(int max, uint128 *state);
unsigned int computeCRC32(void *data, int dataSize);
}

12
shared/src/values/Dna.cpp
View File

@ -11,7 +11,7 @@ namespace DNA
uint8_t *array = (uint8_t *)dna;
for (size_t i = 0; i < sizeof(Dna); i++)
{
array[i] = mrand::getValue(0, 255, state);
array[i] = mrand::getValue(256, state);
}
return;
}
@ -23,7 +23,7 @@ namespace DNA
uint8_t *ca = (uint8_t *)c;
for (size_t i = 0; i < sizeof(Dna); i++)
{
int val = mrand::getValue(0, 1, state);
int val = mrand::getValue(2, state);
if (val == 0)
{
ca[i] = p1a[i];
@ -42,14 +42,14 @@ namespace DNA
uint8_t *ca = (uint8_t *)c;
for (size_t i = 0; i < sizeof(Dna); i++)
{
int val = mrand::getValue(0, 1, state);
int val = mrand::getValue(2, state);
if (val == 0)
{
ca[i] = p1a[i];
}
else
{
ca[i] = mrand::getValue(0, 255, state);
ca[i] = mrand::getValue(256, state);
}
}
}
@ -58,8 +58,8 @@ namespace DNA
uint8_t *array = (uint8_t *)dna;
for (size_t i = 0; i < num; i++)
{
int pos = mrand::getValue(0, sizeof(Dna), state);
array[pos] = mrand::getValue(0, 255, state);
int pos = mrand::getValue(sizeof(Dna), state);
array[pos] = mrand::getValue(256, state);
}
}
}

8
shared/src/values/DnaManager.cpp
View File

@ -1,5 +1,3 @@
#include <unistd.h>
#include "values/DnaManager.hpp"
@ -86,11 +84,11 @@ void DnaManager::newGen(DnaManagerData *data)
for (auto &&i : data->disliked)
{
size_t p1 = mrand::getValue(0, data->liked.size() - 1, &data->randSeed);
size_t p2 = mrand::getValue(0, data->liked.size() - 1, &data->randSeed);
size_t p1 = mrand::getValue(data->liked.size(), &data->randSeed);
size_t p2 = mrand::getValue(data->liked.size(), &data->randSeed);
while (p1 == p2)
{
p2 = mrand::getValue(0, data->liked.size(), &data->randSeed);
p2 = mrand::getValue(data->liked.size(), &data->randSeed);
}
p1 = data->liked[p1];

7
shared/src/values/mrand.cpp
View File

@ -47,11 +47,10 @@ namespace mrand
return rprand_state;
}
int getValue(int min, int max, uint128 *state)
int getValue(int max, uint128 *state)
{
int value = my_rprand_xoshiro((uint32_t *)state) % (std::abs(max - min) + 1) + min;
return value;
uint32_t rand = my_rprand_xoshiro((uint32_t *)state);
return rand % max;
}
float getFloat(uint128 *state)