diff options
author | Erich Eckner <git@eckner.net> | 2019-11-06 15:47:36 +0100 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2019-11-06 15:47:36 +0100 |
commit | cbde53f09fd72d2019711c2decd1d603ef898fc9 (patch) | |
tree | 334372713cc8300028c8d72de241ee50377ce365 | |
parent | e754adc4ebc4ada36a615cb363a7cb16a50c8aa5 (diff) | |
download | integriere-cbde53f09fd72d2019711c2decd1d603ef898fc9.tar.xz |
-rw-r--r-- | integriere.pas | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/integriere.pas b/integriere.pas index 1e5be05..71a0d18 100644 --- a/integriere.pas +++ b/integriere.pas @@ -12,15 +12,17 @@ var begin - if (paramcount<>2) or not fileExists(paramstr(1)) then begin - writeln('Usage: '+paramstr(0)+' Harmonischengrenzen.csv Kanal'); + if (paramcount<>3) + or not fileExists(paramstr(1)) + or not fileExists(paramstr(2)) then begin + writeln('Usage: '+paramstr(0)+' Lineout.csv Harmonischengrenzen.csv Kanal'); halt(1); end; - Kanal:=strToInt(paramstr(2)); + Kanal:=strToInt(paramstr(3)); setLength(Grenzen,0); - assignFile(Datei, paramstr(1)); + assignFile(Datei, paramstr(2)); reset(Datei); while not eof(Datei) do begin readln(Datei, s); @@ -33,8 +35,10 @@ begin y:=0; momentan:=0; - while not eof do begin - readln(s); + assignFile(Datei, paramstr(1)); + reset(Datei); + while not eof(Datei) do begin + readln(Datei,s); x:=strToFloat(erstesArgument(s)); if (momentan<length(Grenzen)) and (x>Grenzen[momentan]) then begin writeln(intToStr(momentan),' ',myFloatToStr(y)); @@ -44,6 +48,7 @@ begin erstesArgument(s); y:=y+strToFloat(s); end; + closeFile(Datei); writeln(intToStr(momentan),' ',myFloatToStr(y)); end. |