diff --git a/defs/defs.py b/defs/defs.py index d29d607..e1ded07 100644 --- a/defs/defs.py +++ b/defs/defs.py @@ -1,4 +1,39 @@ -class HelloWorld: +### -------------------------------------------------------------------------------- ### +### IMPORTS AND CONFIGURATIONS - def __init__(self, number): +import os +import pandas as pd + +### -------------------------------------------------------------------------------- ### +### OFR ANALYSIS + +class OFRSample: + + def __init__(self, number, diameterlist, countlist): self.number = number + self.diameterlist = diameterlist + self.countlist = countlist + self.samplelist = {} + +class OFRAnalyser: + + def __init__(self, sourcefile): + self.sourcefile = sourcefile + + def read(self, headlines = 238): + pass + + def getTotalMass(self): + pass + + def plotTimeSeries(self): + pass + + def plotDistribution(self, sample): + pass + + def plotAllDistributions(self): + pass + +### -------------------------------------------------------------------------------- ### +### \ No newline at end of file diff --git a/vis/playground.ipynb b/vis/playground.ipynb index a6620b9..caad0d7 100644 --- a/vis/playground.ipynb +++ b/vis/playground.ipynb @@ -6,37 +6,50 @@ "metadata": { "collapsed": true, "ExecuteTime": { - "end_time": "2026-06-09T09:13:43.264516Z", - "start_time": "2026-06-09T09:13:43.260078Z" + "end_time": "2026-06-15T14:00:10.219007Z", + "start_time": "2026-06-15T14:00:09.797047Z" } }, - "source": "from defs.defs import HelloWorld", + "source": "from defs.defs import OFRSample, OFRAnalyser", "outputs": [], - "execution_count": 6 + "execution_count": 1 }, { "metadata": { "ExecuteTime": { - "end_time": "2026-06-09T09:14:07.016214Z", - "start_time": "2026-06-09T09:14:07.013319Z" + "end_time": "2026-06-15T14:00:11.740245Z", + "start_time": "2026-06-15T14:00:11.737126Z" } }, "cell_type": "code", - "source": [ - "hw = HelloWorld(number=4)\n", - "print(hw.number)" - ], + "source": "anlsyr = OFRAnalyser(sourcefile=\"/Volumes/5505/People/David_Tschan/data/OFR_SMPS/2026/processed/06_June/20260612/20260612_SET02_EXP01_full.csv\")", "id": "83604ca62804491c", + "outputs": [], + "execution_count": 2 + }, + { + "metadata": { + "ExecuteTime": { + "end_time": "2026-06-15T14:00:19.825781Z", + "start_time": "2026-06-15T14:00:19.820656Z" + } + }, + "cell_type": "code", + "source": "anlsyr.sourcefile", + "id": "fc69589de06ec7c3", "outputs": [ { - "name": "stdout", - "output_type": "stream", - "text": [ - "4\n" - ] + "data": { + "text/plain": [ + "'/Volumes/5505/People/David_Tschan/data/OFR_SMPS/2026/processed/06_June/20260612/20260612_SET02_EXP01_full.csv'" + ] + }, + "execution_count": 3, + "metadata": {}, + "output_type": "execute_result" } ], - "execution_count": 7 + "execution_count": 3 }, { "metadata": {}, @@ -44,7 +57,7 @@ "outputs": [], "execution_count": null, "source": "", - "id": "fc69589de06ec7c3" + "id": "84a36071715be21" } ], "metadata": {