From 453ffd4dc185a47245a13ab648b48c2929d4239d Mon Sep 17 00:00:00 2001
From: xiyehu2 <xiyehu2@illinois.edu>
Date: Tue, 24 Oct 2023 14:41:40 -0500
Subject: [PATCH] bug fixing in saveParam and loadParam
---
Cpp/lib/waveform.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Cpp/lib/waveform.cpp b/Cpp/lib/waveform.cpp
index 950fe1f..57332ce 100644
--- a/Cpp/lib/waveform.cpp
+++ b/Cpp/lib/waveform.cpp
@@ -107,15 +107,15 @@ void ArrayWaveform::saveParam(std::string fileName) {
);
std::ofstream saveFile(fileName);
if (saveFile.is_open()) {
- saveFile << "samplingRate," << this->wfmParam.samplingRate << "\n";
- saveFile << "freqResolution," << this->wfmParam.freqResolution << "\n";
- saveFile << "freqTones,"
+ saveFile << this->wfmParam.samplingRate << "\n";
+ saveFile << this->wfmParam.freqResolution << "\n";
+ saveFile
<< this->wfmParam.freqTones.format(csvFormat)
<< "\n";
- saveFile << "phases,"
+ saveFile
<< this->wfmParam.phases.format(csvFormat)
<< "\n";
- saveFile << "amplitudes,"
+ saveFile
<< this->wfmParam.amplitudes.format(csvFormat)
<< "\n";
saveFile.close();
@@ -142,19 +142,19 @@ void ArrayWaveform::loadParam(std::string fileName) {
this->wfmParam.freqResolution = std::stoi(std::string(line[0]));
break;
case 2:
- for (auto i = 0; i < line.size() - 1; i++) {
+ for (auto i = 0; i < line.size(); i++) {
lineDataI.push_back(std::stoi(std::string(line[i])));
}
setFreqTone(lineDataI);
break;
case 3:
- for (auto i = 0; i < line.size() - 1; i++) {
+ for (auto i = 0; i < line.size(); i++) {
lineDataD.push_back(std::stod(std::string(line[i])));
}
setPhase(lineDataD);
break;
case 4:
- for (auto i = 0; i < line.size() - 1; i++) {
+ for (auto i = 0; i < line.size(); i++) {
lineDataD.push_back(std::stod(std::string(line[i])));
}
setAmplitude(lineDataD);
--
GitLab