diff --git a/analyse.ipynb b/analyse.ipynb index 56ed02a9eed20f023a4396c0d17955ebb13d36ce..f0e00450fd6726875fb0fea8676bc068e9848064 100644 --- a/analyse.ipynb +++ b/analyse.ipynb @@ -43,11 +43,9 @@ "exp_time = df [0]\n", "cpu_temp = df [1]\n", "ir_frame = df.loc[:, 2:769]\n", - "v2 = False\n", - "## Uncomment below if your lab is after 27 Feb\n", - "# v2 = True\n", - "# cpu_util = df [770]\n", - "# fan_cycl = df [771]" + "v2 = True\n", + "cpu_util = df [770]\n", + "fan_cycl = df [771]" ] }, { @@ -191,7 +189,7 @@ "metadata": {}, "source": [ "## Post-processing data\n", - "You can use the gicen code or write your own code to post-prosess the data." + "You can use the given code or write your own code to post-prosess the data." ] }, { @@ -204,9 +202,8 @@ "exp_time_n\n", "cpu_temp_n\n", "data_array_n\n", - "## Uncomment below if your lab is after 27 Feb\n", - "# cpu_util_n\n", - "# fan_cycl_n" + "cpu_util_n\n", + "fan_cycl_n" ] } ], diff --git a/readme.md b/readme.md index 6a0f0d2756a9d29ee58f5cc48fdeeedae85a3d1b..ceb45485d78f23edf4ca4d577b0d319246783d6e 100644 --- a/readme.md +++ b/readme.md @@ -14,7 +14,7 @@ The data files saved to your USB during the lab session should be copy to the `` ## Installation -You can run the Notebook on your own computer following the instructions below or work online by uploading it to [Google Colab](https://colab.research.google.com/). +You can run the Notebook on your own computer following the instructions below OR work online by uploading it to [Google Colab](https://colab.research.google.com/). ### Initialising virtual environment @@ -46,20 +46,18 @@ pip install numpy matplotlib pandas notebook ``` ## Usage -Start Jupyter Notebook by using the command and setting the path to our working directory ``path/`` +_If you are using Colab_, you might receive an error relating to ``ipympl``, this can be installed by running the following in your notebook +``` +!pip install ipympl +``` + +_If you are running notebook locally_, start Jupyter Notebook by using the command and setting the path to our working directory ``path/`` ```bash jupyter notebook --notebook-dir 'path/' ``` -Jupyter Notebook should automatically open in your browser and you should be able to navigate from here. +Jupyter Notebook should then automatically open in your browser and you should be able to navigate from here. -### For lab sessions after 27 Feb -The ourput data includes CPU utilisation and fan speed. Your are exepcted to use all data in your exported datafile, so please uncomment (removing ``#`` at the start of line) the code to process these data in the notebook. -```python3 -v2 = True -cpu_util = df [770] -fan_cycl = df [771] -``` ## Contributing We welcome any bug report and contribution to the code is also encouraged. Please email [Schoen Cho](mailto:zc282@cam.ac.uk) or [Prof. Simone Hochgreb](mailto:sh372@cam.ac.uk) if there is any problem.