diff --git a/.gitignore b/.gitignore
index 6d77476..00003d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
*~
nbproject/*
+.idea/*
+*.csv
+*.svg
diff --git a/.idea/Mranalysis.iml b/.idea/Mranalysis.iml
new file mode 100644
index 0000000..a34a857
--- /dev/null
+++ b/.idea/Mranalysis.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..e206d70
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..47e414c
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..8b9e3d9
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
new file mode 100644
index 0000000..922003b
--- /dev/null
+++ b/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..c80f219
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/createplot.php b/createplot.php
index 58a3ab3..fb7e3cc 100644
--- a/createplot.php
+++ b/createplot.php
@@ -1,28 +1,73 @@
$value) {
- if ($key == 0) {
- continue;
+ $vector = array();
+ foreach ($source as $key => $value) {
+ if ($key == 0) {
+ continue;
+ }
+ array_push($vector, $value);
}
- $content .= $key . "\t" . $value . "\n";
+ $tmpRow = count($vector);
+ if ($tmpRow > $maxrow) {
+ $maxrow = $tmpRow;
+ }
+ $content[$file] = $vector;
+ #file_put_contents($testPath . $file. ".dat", $content);
+ #$script = "set terminal svg;set xrange [1:];set style data lines;set out \"$testPath$file.svg\";plot \"$testPath$file.dat\";";
+ #file_put_contents($testPath . $file. ".pl", $script);
+ #exec("gnuplot $testPath$file.pl");
}
-
- file_put_contents($testPath . $file. ".dat", $content);
-
- $script = "set terminal svg;set xrange [1:];set style data lines;set out \"$testPath$file.svg\";plot \"$testPath$file.dat\";";
- file_put_contents($testPath . $file. ".pl", $script);
- exec("gnuplot $testPath$file.pl");
}
+//print_r($content);
+
+ $export = "time,";
+
+// Header
+ foreach ($content as $key => $value) {
+ $export .= $key . ",";
+ }
+
+ $export = rtrim($export, ",") . "\n";
+
+ for ($i = 0; $i < $maxrow; $i++) {
+ $row = "$i,";
+ foreach ($content as $key => $value) {
+ if (count($value) > $i) {
+ $row.=$value[$i] . ",";
+ } else {
+ $row.="0,";
+ }
+ }
+ $export .= rtrim($row, ",") . "\n";
+ }
+ file_put_contents($testPath . $csvname, $export);
+ echo $export;
}
+createCSV("test/mrdumps/", "all.csv", "[0-9][0-9][0-9].json_rv1");
+createCSV("test/mrdumps/", "0xx.csv", "[0][0-9][0-9].json_rv1");
+createCSV("test/mrdumps/", "1xx.csv", "[1][0-9][0-9].json_rv1");
+createCSV("test/mrdumps/", "2xx.csv", "[2][0-9][0-9].json_rv1");
+createCSV("test/mrdumps/", "x0x.csv", "[0-9][0][0-9].json_rv1");
+createCSV("test/mrdumps/", "x1x.csv", "[0-9][1][0-9].json_rv1");
+createCSV("test/mrdumps/", "x2x.csv", "[0-9][2][0-9].json_rv1");
+createCSV("test/mrdumps/", "xx0.csv", "[0-9][0-9][0].json_rv1");
+createCSV("test/mrdumps/", "xx1.csv", "[0-9][0-9][1].json_rv1");
+createCSV("test/mrdumps/", "xx2.csv", "[0-9][0-9][2].json_rv1");
+createCSV("test/mrdumps/", "xx3.csv", "[0-9][0-9][3].json_rv1");
+createCSV("test/mrdumps/", "xx4.csv", "[0-9][0-9][4].json_rv1");
+createCSV("test/mrdumps/", "xx5.csv", "[0-9][0-9][5].json_rv1");
+createCSV("test/mrdumps/", "xx7.csv", "[0-9][0-9][7].json_rv1");
+createCSV("test/mrdumps/", "20x.csv", "[2][0][0-9].json_rv1");
+
?>
diff --git a/csv/csvutilies.py b/csv/csvutilies.py
new file mode 100644
index 0000000..1d60b82
--- /dev/null
+++ b/csv/csvutilies.py
@@ -0,0 +1,174 @@
+__author__ = 'stubbfel'
+import csv
+def readCSV(fileName):
+ with open(fileName, newline='\n') as csvFile:
+ reader = csv.reader(csvFile)
+ csvTable = []
+ for row in reader:
+ csvTable.append(row)
+ return csvTable
+
+def writeCSV (fileName,table):
+ with open(fileName, 'w', newline='\n') as csvFile:
+ writer = csv.writer(csvFile, delimiter='\t')
+ writer.writerows(table)
+
+def aggrateRow(row,discardIndex):
+ colCount = 0
+ colSum = 0
+ workcopy = row[:]
+ del workcopy[discardIndex]
+
+ for col in workcopy:
+ colCount += 1
+ if col.isnumeric():
+ colSum += int(col)
+ return colSum / colCount
+
+def aggrateCol(colIndex, table):
+ rowCount = 0
+ rowSum = 0
+
+ for row in table:
+ if colIndex < len(row):
+ str = row[colIndex]
+ if is_number(str):
+ rowSum += float(str)
+ rowCount += 1
+
+ mean = rowSum / rowCount
+ tmVar = 0
+ for row in table:
+ if colIndex <