From 1656f261462f0e266fa11c4bdc43c1ed52ccc530 Mon Sep 17 00:00:00 2001
From: Francesco Nattino <f.nattino@esciencecenter.nl>
Date: Mon, 5 Sep 2022 14:50:41 +0200
Subject: [PATCH] update tutorial

---
 tutorial.ipynb | 58 +++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/tutorial.ipynb b/tutorial.ipynb
index 5fcd126..33f4cbf 100644
--- a/tutorial.ipynb
+++ b/tutorial.ipynb
@@ -44,15 +44,15 @@
        "          -0.24100002, -0.24000002])},\n",
        "  'raw_classification': {'type': 'uint8',\n",
        "   'data': array([9, 9, 9, ..., 9, 9, 9], dtype=uint8)},\n",
-       "  'intensity': {'type': 'uint16',\n",
-       "   'data': array([ 41, 152,  12, ...,  10,  15,  10], dtype=uint16)},\n",
        "  'gps_time': {'type': 'float64',\n",
        "   'data': array([78563787.97322202, 78563787.93570042, 78563787.93571067, ...,\n",
-       "          78563778.28828931, 78563778.3107884 , 78563778.32578015])}},\n",
-       " 'log': [{'time': '2020-05-19 14:56:55.083339',\n",
+       "          78563778.28828931, 78563778.3107884 , 78563778.32578015])},\n",
+       "  'intensity': {'type': 'uint16',\n",
+       "   'data': array([ 41, 152,  12, ...,  10,  15,  10], dtype=uint16)}},\n",
+       " 'log': [{'time': '2022-09-05 12:50:13.438169',\n",
        "   'module': 'laserchicken.io.load',\n",
        "   'parameters': {'path': 'testdata/AHN3.las', 'args': ()},\n",
-       "   'version': '0.4.0'}]}"
+       "   'version': '0.6.0'}]}"
       ]
      },
      "execution_count": 2,
@@ -91,21 +91,21 @@
        "          -0.24100002, -0.24000002])},\n",
        "  'raw_classification': {'type': 'uint8',\n",
        "   'data': array([9, 9, 9, ..., 9, 9, 9], dtype=uint8)},\n",
-       "  'intensity': {'type': 'uint16',\n",
-       "   'data': array([ 41, 152,  12, ...,  10,  15,  10], dtype=uint16)},\n",
        "  'gps_time': {'type': 'float64',\n",
        "   'data': array([78563787.97322202, 78563787.93570042, 78563787.93571067, ...,\n",
        "          78563778.28828931, 78563778.3107884 , 78563778.32578015])},\n",
+       "  'intensity': {'type': 'uint16',\n",
+       "   'data': array([ 41, 152,  12, ...,  10,  15,  10], dtype=uint16)},\n",
        "  'normalized_height': {'type': 'float64',\n",
        "   'data': array([1.236, 1.311, 1.317, ..., 1.336, 1.336, 1.337])}},\n",
-       " 'log': [{'time': '2020-05-19 14:56:55.083339',\n",
+       " 'log': [{'time': '2022-09-05 12:50:13.438169',\n",
        "   'module': 'laserchicken.io.load',\n",
        "   'parameters': {'path': 'testdata/AHN3.las', 'args': ()},\n",
-       "   'version': '0.4.0'},\n",
-       "  {'time': '2020-05-19 14:56:55.149038',\n",
+       "   'version': '0.6.0'},\n",
+       "  {'time': '2022-09-05 12:50:13.495605',\n",
        "   'module': 'laserchicken.normalize',\n",
        "   'parameters': {'cell_size': None},\n",
-       "   'version': '0.4.0'}]}"
+       "   'version': '0.6.0'}]}"
       ]
      },
      "execution_count": 3,
@@ -137,21 +137,21 @@
        "          -0.24100002, -0.24000002])},\n",
        "  'raw_classification': {'type': 'uint8',\n",
        "   'data': array([9, 9, 9, ..., 9, 9, 9], dtype=uint8)},\n",
-       "  'intensity': {'type': 'uint16',\n",
-       "   'data': array([ 41, 152,  12, ...,  10,  15,  10], dtype=uint16)},\n",
        "  'gps_time': {'type': 'float64',\n",
        "   'data': array([78563787.97322202, 78563787.93570042, 78563787.93571067, ...,\n",
        "          78563778.28828931, 78563778.3107884 , 78563778.32578015])},\n",
+       "  'intensity': {'type': 'uint16',\n",
+       "   'data': array([ 41, 152,  12, ...,  10,  15,  10], dtype=uint16)},\n",
        "  'normalized_height': {'type': 'float64',\n",
        "   'data': array([1.236, 1.311, 1.317, ..., 1.336, 1.336, 1.337])}},\n",
-       " 'log': [{'time': '2020-05-19 14:56:55.083339',\n",
+       " 'log': [{'time': '2022-09-05 12:50:13.438169',\n",
        "   'module': 'laserchicken.io.load',\n",
        "   'parameters': {'path': 'testdata/AHN3.las', 'args': ()},\n",
-       "   'version': '0.4.0'},\n",
-       "  {'time': '2020-05-19 14:56:55.149038',\n",
+       "   'version': '0.6.0'},\n",
+       "  {'time': '2022-09-05 12:50:13.495605',\n",
        "   'module': 'laserchicken.normalize',\n",
        "   'parameters': {'cell_size': None},\n",
-       "   'version': '0.4.0'}]}"
+       "   'version': '0.6.0'}]}"
       ]
      },
      "execution_count": 4,
@@ -250,8 +250,8 @@
       "Start tree creation\n",
       "Done with env tree creation\n",
       "Done with target tree creation\n",
-      "Extracting feature(s) \"['eigenv_1', 'eigenv_2', 'eigenv_3', 'normal_vector_1', 'normal_vector_2', 'normal_vector_3', 'slope']\"Extracting feature(s) \"['eigenv_1', 'eigenv_2', 'eigenv_3', 'normal_vector_1', 'normal_vector_2', 'normal_vector_3', 'slope']\" took 0.22 seconds\n",
-      "Extracting feature(s) \"['mean_z', 'std_z', 'coeff_var_z']\"Extracting feature(s) \"['mean_z', 'std_z', 'coeff_var_z']\" took 0.21 seconds\n",
+      "Extracting feature(s) \"['eigenv_1', 'eigenv_2', 'eigenv_3', 'normal_vector_1', 'normal_vector_2', 'normal_vector_3', 'slope']\"Extracting feature(s) \"['eigenv_1', 'eigenv_2', 'eigenv_3', 'normal_vector_1', 'normal_vector_2', 'normal_vector_3', 'slope']\" took 0.25 seconds\n",
+      "Extracting feature(s) \"['mean_z', 'std_z', 'coeff_var_z']\"Extracting feature(s) \"['mean_z', 'std_z', 'coeff_var_z']\" took 0.19 seconds\n",
       "The following unrequested features were calculated as a side effect, but will not be returned: ['normal_vector_3', 'normal_vector_2', 'normal_vector_1', 'eigenv_3', 'eigenv_2', 'eigenv_1', 'coeff_var_z']\n"
      ]
     }
@@ -298,12 +298,12 @@
     {
      "data": {
       "text/plain": [
-       "['band_ratio_1<normalized_height<2',\n",
-       " 'band_ratio_2<normalized_height',\n",
-       " 'band_ratio_2<normalized_height<3',\n",
-       " 'band_ratio_3<normalized_height',\n",
-       " 'band_ratio_normalized_height<1',\n",
-       " 'band_ratio_z<0',\n",
+       "['band_ratio_1_normalized_height_2',\n",
+       " 'band_ratio_2_normalized_height',\n",
+       " 'band_ratio_2_normalized_height_3',\n",
+       " 'band_ratio_3_normalized_height',\n",
+       " 'band_ratio_normalized_height_1',\n",
+       " 'band_ratio_z_0',\n",
        " 'coeff_var_intensity',\n",
        " 'coeff_var_normalized_height',\n",
        " 'coeff_var_z',\n",
@@ -579,14 +579,14 @@
       "Start tree creation\n",
       "Done with env tree creation\n",
       "Done with target tree creation\n",
-      "Extracting feature(s) \"['band_ratio_1<normalized_height<2']\"Extracting feature(s) \"['band_ratio_1<normalized_height<2']\" took 0.08 seconds\n"
+      "Extracting feature(s) \"['band_ratio_1_normalized_height_2']\"Extracting feature(s) \"['band_ratio_1_normalized_height_2']\" took 0.08 seconds\n"
      ]
     }
    ],
    "source": [
     "cylinder = build_volume('infinite cylinder', radius=5)\n",
     "neighborhoods = compute_neighborhoods(point_cloud, targets, cylinder)\n",
-    "compute_features(point_cloud, neighborhoods, targets, ['band_ratio_1<normalized_height<2'], cylinder)"
+    "compute_features(point_cloud, neighborhoods, targets, ['band_ratio_1_normalized_height_2'], cylinder)"
    ]
   },
   {
@@ -623,9 +623,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.2"
+   "version": "3.8.13"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }