diff --git a/makefile-old b/makefile-old deleted file mode 100644 index c33bea0..0000000 --- a/makefile-old +++ /dev/null @@ -1,92 +0,0 @@ -#-----------------------------------------------------------------------------# - -# choose shell -SHELL:=/bin/bash - -RAW = ../raw/ - -# directory names -SRC = src/ -LIB = lib/ -CYT = cyt/ - -# name of executable -EXE = eatraw - -# compiler and its options -CCC = g++ -std=c++11 -#OPT = -O3 -Wall -mavx -mno-tbm -mf16c -mno-f16c -OPT = -O3 -Wall -Werror - -#-----------------------------------------------------------------------------# -# C++ - -# build executable -$(EXE) : $(SRC)main.cpp $(LIB)raweat.hpp $(LIB)hexshow.hpp $(LIB)rawmerge.hpp output - $(CCC) $(OPT) $< -o $@ - -# development version -eatdev : $(SRC)main_dev.cpp $(LIB)raweat.hpp - $(CCC) $(OPT) $< -o $@ - -# build target for conversion set of .raw files -eatall : $(SRC)eatall.cpp $(LIB)raweat.hpp - $(CCC) $(OPT) $< -o $@ - -# remove executable -clean : - rm -f $(EXE) - rm -f eatall - rm -f eatdev - rm -rf output/ - -# check existence of name of executable globally -chexe:=$(shell command -v $(EXE)) - -# install executable if name does not exist yet -install : $(EXE) -ifeq ($(chexe),) - cp $(EXE) /usr/local/bin/ -else - @echo "executable with name already exists! choose different name!" - @exit 1 -endif - -# uninstall -uninstall : - rm /usr/local/bin/$(EXE) - -#-----------------------------------------------------------------------------# -# Python - -# build python module -py : $(CYT)setup_raw_eater.py $(CYT)raw_eater.pyx $(CYT)raw_eater.pxd $(LIB)raweat.hpp \ - $(CYT)setup_raw_meat.py $(CYT)raw_meat.pyx $(CYT)raw_meat.pxd $(LIB)rawmerge.hpp \ - output - python3 $(CYT)setup_raw_eater.py build_ext --inplace - python3 $(CYT)setup_raw_meat.py build_ext --inplace - cp raw_eater.cpython-*.so pyt/ - cp raw_meat.cpython-*.so pyt/ - rm *.so - -py-install: $(CYT)setup_raw_eater.py $(CYT)raw_eater.pyx $(CYT)raw_eater.pxd $(LIB)raweat.hpp \ - $(CYT)setup_raw_meat.py $(CYT)raw_meat.pyx $(CYT)raw_meat.pxd $(LIB)rawmerge.hpp - python3 $(CYT)setup_raw_eater.py install --record files_raw_eater.txt - python3 $(CYT)setup_raw_meat.py install --record files_raw_meat.txt - -py-clean : - rm -f raw_eater.cpython-*.so - rm -f pyt/raw_eater.cpython-*.so - rm -f $(CYT)raw_eater.cpp - rm -f raw_meat.cpython-*.so - rm -f pyt/raw_meat.cpython-*.so - rm -f $(CYT)raw_meat.cpp - rm -rf build/ - rm -f *.txt - rm -rf output/ - -# prepare directory for test output -output : - mkdir -pv output/ - -#-----------------------------------------------------------------------------# diff --git a/src/main-old.cpp b/src/main-old.cpp deleted file mode 100644 index 13ef599..0000000 --- a/src/main-old.cpp +++ /dev/null @@ -1,92 +0,0 @@ -//---------------------------------------------------------------------------// - -#include -#include -#include "../lib/raweat.hpp" -#include "../lib/rawmerge.hpp" - -//---------------------------------------------------------------------------// - -int main(int argc, char* argv[]) -{ - - if ( argc != 3 ) //or ( argc == 1 && std::string(argv[1]) == str::string("--help") ) - { - std::cout<<"\n"<<"Usage: ./eatit INPUTFILE OUTPUTFILE"<<"\n" - <<"Convert any file in imc-format .raw to plain text .csv"<<"\n" - <<"Example: ./eatit Druck_THZ_DK.raw druck_thz_dk.csv"<<"\n\n"; - return 0; - } - - // get name/path of file from CLI argument - std::string rawfile(argv[1]); - - // declare instance of 'raw_eater' (and decode data) - raw_eater eatraw; //rawfile,false); - - // set file to be decoded - eatraw.set_file(rawfile,true); - - // do conversion - eatraw.setup_and_conversion(false); - - // eatraw.show_markers(); - - // std::cout<<"\n"; -// std::map> marks = eatraw.get_markers(); -// for ( auto mrk: marks ) -// { -// // get data -// std::vector dat = eatraw.get_marker_data(mrk.first); -// -// // print marker name, length and data -// std::cout< segvec = eatraw.get_segment(mrk.first); -// std::cout<<"number of elements in segment: "< maindata = eatraw.get_data(); -// std::cout<<"\nsize of data array: "< invalid/corrupt .raw file\n"; - } - -//---------------------------------------------------------------------------// - - // declare instance of 'raw_merger' - raw_merger eatmea; - - // add channels - eatmea.add_channel(rawfile,false); - eatmea.add_channel("smp/VehicleSpeed_HS.raw",false); - // eatmea.add_channel("smp/Mercedes_E-Klasse-2019-08-08/Flex_StWhl_AnglSpd.raw",false); - // eatmea.add_channel("smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Disc_FR.raw",false); - - // write merged table - if ( eatmea.get_num_channels() > 0 ) - { - eatmea.write_table_all("output/allchannels.csv",' '); - } - else - { - std::cout<<"no valid channel added\n"; - } - - return 0; -} - -//---------------------------------------------------------------------------//