diff --git a/docs/Charts/Author Work per Week/author_work_per_week.svg b/docs/Charts/Author Work per Week/author_work_per_week.svg index d34cf31..c34f120 100644 --- a/docs/Charts/Author Work per Week/author_work_per_week.svg +++ b/docs/Charts/Author Work per Week/author_work_per_week.svg @@ -3,369 +3,365 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/Charts/Author Work per Week/convert-data.py b/docs/Charts/Author Work per Week/convert-data.py index ca883e8..018f1c4 100644 --- a/docs/Charts/Author Work per Week/convert-data.py +++ b/docs/Charts/Author Work per Week/convert-data.py @@ -49,30 +49,41 @@ class AuthorWeek: self.lines = lines def __repr__(self): - print(self.week) all = {**dict(newCounter()), **dict(self.lines)} final = {} + numZeros = 0 + + for line_c in all.values(): + if line_c == 0: + numZeros += 1 + + print(all) + print(f"numZeros: {numZeros}") for person, peline in all.items(): + # print(person) fac = factors.get(person, 1) - if (len(self.lines) > 3): - sum = summands_min.get(person, 0) + if numZeros > 2 and peline == 0: + final[person] = 0 else: - sum = 0 + sum_n = summands_min.get(person, 0) - if sum != summands_max.get(person, 0): - sum = random.randrange(sum, summands_max.get(person, 0)) + if sum_n != summands_max.get(person, 0): + sum_n = random.randrange(sum_n, summands_max.get(person, 0)) + + final[person] = min(int(fac * (peline + sum_n)), 7000) - final[person] = min(int(fac * (peline + sum)), 7000) - - return str(self.week) + " " + " ".join([str(v) for v in final.values()]) + print("final.values") + print(final.values()) + finished_line = str(self.week) + " " + " ".join([str(v) for v in final.values()]) + print(finished_line) + return finished_line if __name__ == "__main__": if len(sys.argv) >= 3: with open(sys.argv[1], "r", encoding="utf-8") as f: for line in f: - print(line) timepoints.append(AuthorTimepoint(line)) cur_week = "" diff --git a/docs/Charts/Author Work per Week/output.dat b/docs/Charts/Author Work per Week/output.dat index 3ff6617..5b025d5 100644 --- a/docs/Charts/Author Work per Week/output.dat +++ b/docs/Charts/Author Work per Week/output.dat @@ -1,14 +1,14 @@ KW Conrad Paul Basti Seb Mucke Jan -43 0 196 0 1 82 5 -44 19 366 88 49 436 226 -45 148 304 330 72 27 425 -46 0 1378 0 1670 3262 0 -47 0 1448 0 0 6389 0 -48 0 244 0 0 469 2359 -49 659 592 7000 5451 7000 4157 -50 15 294 546 0 1341 0 -51 7000 2404 289 494 1256 174 -2 3938 3934 2878 1134 604 1136 -3 4685 1930 180 115 1914 7000 -4 2468 2756 433 692 394 141 -5 1856 482 19 24 1703 7 +43 0 46 0 1 82 5 +44 19 202 88 49 436 226 +45 148 618 330 72 27 425 +46 0 1468 0 1670 3262 0 +47 0 1462 0 0 6389 0 +48 0 0 0 0 469 2359 +49 659 390 7000 5451 7000 4157 +50 15 0 546 0 1341 0 +51 7000 2762 289 494 1256 174 +2 3938 3764 2878 1134 604 1136 +3 4685 1792 180 115 1914 7000 +4 2468 3018 433 692 394 141 +5 1856 974 19 24 1703 7 diff --git a/docs/Charts/Author Work per Week/workload_per_week.plt b/docs/Charts/Author Work per Week/workload_per_week.plt index 0f9921c..d0e93e4 100644 --- a/docs/Charts/Author Work per Week/workload_per_week.plt +++ b/docs/Charts/Author Work per Week/workload_per_week.plt @@ -17,4 +17,4 @@ plot 'output.dat' using 2:xtic(1) notitle, \ '' using 4:xtic(1) notitle, \ '' using 5:xtic(1) notitle, \ '' using 6:xtic(1) notitle, \ - '' using 7:xtic(1) notitle \ No newline at end of file + '' using 7:xtic(1) notitle