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

Update values to fit DB

Browse Source
This commit is contained in:
Nikola Petrov 2025-01-26 00:51:47 +01:00
parent 2998c187d1
commit 477af8b063
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/DnaStore.cpp
View File

@ -14,12 +14,12 @@ void DnaStore::load(DnaManagerData *data)
{ {
if (sys::fileExists(ID_FILE_NAME)) if (sys::fileExists(ID_FILE_NAME))
{ {
sys::loadDataFromFile(ID_FILE_NAME, &data->id, sizeof(uint64_t)); sys::loadDataFromFile(ID_FILE_NAME, &data->id, sizeof(int64_t));
} }
else else
{ {
data->id = time(nullptr); data->id = time(nullptr);
sys::saveDataToFile(ID_FILE_NAME, &data->id, sizeof(uint64_t)); sys::saveDataToFile(ID_FILE_NAME, &data->id, sizeof(int64_t));
} }
if (sys::fileExists(DATA_FILE_NAME)) if (sys::fileExists(DATA_FILE_NAME))

2
server/src/server.cpp
View File

@ -18,7 +18,7 @@ void call(int sock, sockaddr_in newSocketInfo)
{ {
std::cout << "new User" << std::endl; std::cout << "new User" << std::endl;
uint64_t conf, id; int64_t conf, id;
Message message; Message message;
TcpSocket::recvt(sock, &conf, sizeof(conf)); TcpSocket::recvt(sock, &conf, sizeof(conf));

2
shared/inc/NetConst.hpp
View File

@ -1,6 +1,6 @@
#include <cinttypes> #include <cinttypes>
constexpr uint64_t StartHeader = 1737720524UL; constexpr int64_t StartHeader = 1737720524UL;
enum Mess enum Mess
{ {

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

@ -32,7 +32,7 @@ struct DnaManagerData
{ {
int generation; int generation;
uint128 randSeed; uint128 randSeed;
uint64_t id; int64_t id;
int queued; int queued;
int showed; int showed;
std::vector<Dna> vector; std::vector<Dna> vector;

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

@ -10,7 +10,7 @@ struct uint128
namespace mrand namespace mrand
{ {
uint128 getState(unsigned long long seed); uint128 getState(unsigned long seed);
float getFloat(uint128 *state); float getFloat(uint128 *state);
int getValue(int min, int max, uint128 *state); int getValue(int min, int max, uint128 *state);
unsigned int computeCRC32(void *data, int dataSize); unsigned int computeCRC32(void *data, int dataSize);

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

@ -34,10 +34,8 @@ uint64_t rprand_splitmix64(uint64_t &rprand_seed)
namespace mrand namespace mrand
{ {
uint128 getState(unsigned long long seed) uint128 getState(unsigned long rprand_seed)
{ {
uint64_t rprand_seed = (uint64_t)seed; // Set SplitMix64 seed for further use
uint128 rprand_state; uint128 rprand_state;
// To generate the Xoshiro128** state, we use SplitMix64 generator first // To generate the Xoshiro128** state, we use SplitMix64 generator first