uvos/dataformaters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some issues with the matlabtoeis converter

Browse Source
This commit is contained in:
Carl Philipp Klemm 2024-10-29 11:48:49 +01:00
parent 04c5aab3e0
commit f1b0a33e71
2 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -43,6 +43,11 @@ target_link_libraries(rlxpassfail ${COMMON_LINK_LIBRARIES} -lrelaxisloader)
set_property(TARGET rlxpassfail PROPERTY CXX_STANDARD 17)
install(TARGETS rlxpassfail RUNTIME DESTINATION bin)
add_executable(matlabarraytoeis ${COMMON_SRC_FILES} src/matlabarraytoeis.cpp)
target_link_libraries(matlabarraytoeis ${COMMON_LINK_LIBRARIES} -lrelaxisloader)
set_property(TARGET matlabarraytoeis PROPERTY CXX_STANDARD 17)
install(TARGETS matlabarraytoeis RUNTIME DESTINATION bin)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")

30
src/matlabarraytoeis.cpp
View File

@ -1,26 +1,26 @@
#include <filesystem>
#include <kisstype/spectra.h>
#include <iostream>
#include <fstream>
#include <kisstype/type.h>
#include <stdexcept>
#include "tokenize.h"
bool saveData(const std::string& exportName, const eis::Spectra& spectra, const std::filesystem::path& outDir, const std::filesystem::path& originFile)
static bool saveData(const std::string& exportName, const eis::Spectra& spectra, const std::filesystem::path& outDir)
{
std::filesystem::path filename;
size_t index = 0;
do
{
static size_t index = 0;
filename.assign(exportName);
filename.concat("_");
filename.concat(std::to_string(index));
filename.concat(".csv");
++index;
} while(std::filesystem::exists(outDir/filename));
try
{
eis::Spectra(data.data, data.modelStr, data.id + ", \"" + originFile.filename().string() + "\"").saveToDisk(outDir/filename);
spectra.saveToDisk(outDir/filename);
return true;
}
catch(...)
@ -29,15 +29,18 @@ bool saveData(const std::string& exportName, const eis::Spectra& spectra, const
}
}
std::vector<eis::DataPoint> parseLine(const std::string& line)
static std::vector<eis::DataPoint> parseLine(const std::string& line)
{
std::vector<eis::DataPoint> data;
std::vector<std::string> tokens = tokenize(line, '\t');
std::vector<eis::DataPoint> data(tokens.size()/2);
if(tokens.size() % 2 != 0)
throw std::invalid_argument("Line must have an even number of tokens");
for(size_t i = 0; i < tokens.size()/2; ++i)
data.push_back({std::stof(tokens[i]), std::stof(tokens[i+tokens.size()/2])});
{
data[tokens.size()/2-i-1].omega = tokens.size()/2-i-1;
data[tokens.size()/2-i-1].im = std::complex<fvalue>(std::stof(tokens[i]), 0-std::stof(tokens[i+tokens.size()/2]));
}
return data;
}
@ -80,8 +83,13 @@ int main(int argc, char** argv)
std::vector<eis::DataPoint> data = parseLine(eisLine);
eis::Spectra spectra (data, "Unkown", argv[2]);
spectra.addLabel(argv[1], std::stod(rul));
if(!std::filesystem::exists(argv[4]))
std::filesystem::create_directory(argv[4]);
if(!saveData("matlab", spectra, argv[4]))
{
std::cout<<"Could not save to"<<argv[4]<<'\n';
return 1;
}
}
catch(const std::invalid_argument& ex)
{