Skip to content

Commit 57245e4

Browse files
committed
Update mapping visualisation using new rsgislib functions.
1 parent c797d4f commit 57245e4

6 files changed

Lines changed: 750 additions & 593 deletions

08_lidar_forestry_regression/01_intro_and_explore_data.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
"name": "stderr",
179179
"output_type": "stream",
180180
"text": [
181-
"/home/pete/.conda/envs/osgeo-env-v3/lib/python3.9/site-packages/pandas/plotting/_matplotlib/core.py:386: RuntimeWarning: More than 20 figures have been opened. Figures created through the pyplot interface (`matplotlib.pyplot.figure`) are retained until explicitly closed and may consume too much memory. (To control this warning, see the rcParam `figure.max_open_warning`).\n",
181+
"/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/pandas/plotting/_matplotlib/core.py:512: RuntimeWarning: More than 20 figures have been opened. Figures created through the pyplot interface (`matplotlib.pyplot.figure`) are retained until explicitly closed and may consume too much memory. (To control this warning, see the rcParam `figure.max_open_warning`). Consider using `matplotlib.pyplot.close()`.\n",
182182
" fig = self.plt.figure(figsize=self.figsize)\n"
183183
]
184184
}
@@ -795,7 +795,7 @@
795795
"name": "python",
796796
"nbconvert_exporter": "python",
797797
"pygments_lexer": "ipython3",
798-
"version": "3.9.10"
798+
"version": "3.10.8"
799799
}
800800
},
801801
"nbformat": 4,

08_lidar_forestry_regression/02_feature_selection.ipynb

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,27 @@
257257
"name": "stderr",
258258
"output_type": "stream",
259259
"text": [
260-
"100%|██████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████| 9/9 [00:02<00:00, 4.33it/s]\n"
260+
" 0%| | 0/9 [00:00<?, ?it/s]/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/sklearn/cluster/_agglomerative.py:983: FutureWarning: Attribute `affinity` was deprecated in version 1.2 and will be removed in 1.4. Use `metric` instead\n",
261+
" warnings.warn(\n",
262+
" 11%|██████████▌ | 1/9 [00:00<00:02, 3.98it/s]/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/sklearn/cluster/_agglomerative.py:983: FutureWarning: Attribute `affinity` was deprecated in version 1.2 and will be removed in 1.4. Use `metric` instead\n",
263+
" warnings.warn(\n",
264+
" 22%|█████████████████████ | 2/9 [00:00<00:01, 4.10it/s]/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/sklearn/cluster/_agglomerative.py:983: FutureWarning: Attribute `affinity` was deprecated in version 1.2 and will be removed in 1.4. Use `metric` instead\n",
265+
" warnings.warn(\n",
266+
" 33%|███████████████████████████████▋ | 3/9 [00:00<00:01, 4.09it/s]/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/sklearn/cluster/_agglomerative.py:983: FutureWarning: Attribute `affinity` was deprecated in version 1.2 and will be removed in 1.4. Use `metric` instead\n",
267+
" warnings.warn(\n",
268+
" 44%|██████████████████████████████████████████▏ | 4/9 [00:00<00:01, 4.14it/s]/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/sklearn/cluster/_agglomerative.py:983: FutureWarning: Attribute `affinity` was deprecated in version 1.2 and will be removed in 1.4. Use `metric` instead\n",
269+
" warnings.warn(\n",
270+
" 56%|████████████████████████████████████████████████████▊ | 5/9 [00:01<00:00, 4.16it/s]/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/sklearn/cluster/_agglomerative.py:983: FutureWarning: Attribute `affinity` was deprecated in version 1.2 and will be removed in 1.4. Use `metric` instead\n",
271+
" warnings.warn(\n",
272+
" 67%|███████████████████████████████████████████████████████████████▎ | 6/9 [00:01<00:00, 4.18it/s]/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/sklearn/cluster/_agglomerative.py:983: FutureWarning: Attribute `affinity` was deprecated in version 1.2 and will be removed in 1.4. Use `metric` instead\n",
273+
" warnings.warn(\n",
274+
" 78%|█████████████████████████████████████████████████████████████████████████▉ | 7/9 [00:01<00:00, 4.17it/s]/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/sklearn/cluster/_agglomerative.py:983: FutureWarning: Attribute `affinity` was deprecated in version 1.2 and will be removed in 1.4. Use `metric` instead\n",
275+
" warnings.warn(\n",
276+
" 89%|████████████████████████████████████████████████████████████████████████████████████▍ | 8/9 [00:01<00:00, 4.17it/s]/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/sklearn/cluster/_agglomerative.py:983: FutureWarning: Attribute `affinity` was deprecated in version 1.2 and will be removed in 1.4. Use `metric` instead\n",
277+
" warnings.warn(\n",
278+
"100%|███████████████████████████████████████████████████████████████████████████████████████████████| 9/9 [00:02<00:00, 4.14it/s]\n",
279+
"/home/pete/.conda/envs/osgeo-env-v9/lib/python3.10/site-packages/sklearn/cluster/_agglomerative.py:983: FutureWarning: Attribute `affinity` was deprecated in version 1.2 and will be removed in 1.4. Use `metric` instead\n",
280+
" warnings.warn(\n"
261281
]
262282
},
263283
{
@@ -415,27 +435,7 @@
415435
"output_type": "stream",
416436
"text": [
417437
"Using regularization parameter (alpha) for the Lasso estimator of: 0.461\n",
418-
"['Skew', 'CanopyRR', 'Oligophotic_Prop', 'Euphotic_Prop', 'p_mean', 'p_kurtosis', 'p_variation', 'chm_rumple', 'chm_ruggedness', 'chm_vf', 'chm_vl', 'wv_midmin']\n"
419-
]
420-
},
421-
{
422-
"name": "stderr",
423-
"output_type": "stream",
424-
"text": [
425-
"/home/pete/.conda/envs/osgeo-env-v3/lib/python3.9/site-packages/sklearn/linear_model/_base.py:133: FutureWarning: The default of 'normalize' will be set to False in version 1.2 and deprecated in version 1.4.\n",
426-
"If you wish to scale the data, use Pipeline with a StandardScaler in a preprocessing stage. To reproduce the previous behavior:\n",
427-
"\n",
428-
"from sklearn.pipeline import make_pipeline\n",
429-
"\n",
430-
"model = make_pipeline(StandardScaler(with_mean=False), LassoLars())\n",
431-
"\n",
432-
"If you wish to pass a sample_weight parameter, you need to pass it as a fit parameter to each step of the pipeline as follows:\n",
433-
"\n",
434-
"kwargs = {s[0] + '__sample_weight': sample_weight for s in model.steps}\n",
435-
"model.fit(X, y, **kwargs)\n",
436-
"\n",
437-
"Set parameter alpha to: original_alpha * np.sqrt(n_samples). \n",
438-
" warnings.warn(\n"
438+
"['N_Pulses', 'N_Returns', 'FCI', 'LCI', 'VCC', 'h75', 'IQR', 'Skew', 'Kurtosis', 'Closed_Vol', 'Open_Vol', 'Oligophotic_Vol', 'Euphotic_Vol', 'cvm_filled_vol', 'p_mean', 'p_scale', 'chm_rumple', 'chm_ruggedness', 'chm_roughness', 'chm_vf', 'chm_vl', 'chm_vd', 'wv_peaks', 'wv_auc', 'wv_min', 'wv_max', 'wv_width', 'wv_midmin', 'wv_midmax', 'wv_minmax', 'h90f', 'h95f', 'L_mean_f']\n"
439439
]
440440
}
441441
],
@@ -510,7 +510,7 @@
510510
"name": "python",
511511
"nbconvert_exporter": "python",
512512
"pygments_lexer": "ipython3",
513-
"version": "3.9.10"
513+
"version": "3.10.8"
514514
}
515515
},
516516
"nbformat": 4,

08_lidar_forestry_regression/03_simple_linear_regression.ipynb

Lines changed: 153 additions & 112 deletions
Large diffs are not rendered by default.

08_lidar_forestry_regression/04_multiple_linear_regression.ipynb

Lines changed: 236 additions & 187 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)