diff --git a/Notebooks/Raster Factory.ipynb b/Notebooks/Raster Factory.ipynb index 25ddbc4..9587aec 100644 --- a/Notebooks/Raster Factory.ipynb +++ b/Notebooks/Raster Factory.ipynb @@ -41,16 +41,10 @@ "outputs": [], "source": [ "C1 = ra.bulk_load('../Data/lidar/C1', 'C1', filter_treshold=.01, clip_treshold=.1, dtype=np.float32)\n", - "#C2 = ra.bulk_load('../Data/lidar/C2', 'C2', filter_treshold=.5, dtype=np.float32)\n", - "#C3 = ra.bulk_load('../Data/lidar/C3', 'C3', filter_treshold=.5, dtype=np.float32)\n", - "#C123 = ra.bulk_load('../Data/lidar', 'C123', filter_treshold=.5, dtype=np.float32)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "# TMP" + "C2 = ra.bulk_load('../Data/lidar/C2', 'C2', filter_treshold=.01, clip_treshold=.1, dtype=np.float32)\n", + "C3 = ra.bulk_load('../Data/lidar/C3', 'C3', filter_treshold=.2, clip_treshold=.1, dtype=np.float32)\n", + "C12 = ra.bulk_load('../Data/lidar/C1', 'C1', filter_treshold=.01, clip_treshold=.1, dtype=np.float32)\n", + "C123 = ra.bulk_load('../Data/lidar', 'C123', filter_treshold=.08, clip_treshold=.1, dtype=np.float32)" ] }, { @@ -148,7 +142,7 @@ "metadata": {}, "outputs": [], "source": [ - "ra.auto_filter(dfc, treshold=0.5)" + "ra.extremum_clip(dfc, treshold=0.1)" ] }, { @@ -215,16 +209,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "## Raster Pack" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "C123.name" + "## Raster Pool Process" ] }, { @@ -238,25 +223,28 @@ "#mp.set_start_method('spawn')\n", "\n", "def rasterize_cache_mp(data_var, field, res, method, reverse, cache):\n", + " print('FROM WORKER: Start processing {} {} with {} resolution and {} interpolation {}'.format(data_var, field, res, method, 'resversed' if reverse else ''))\n", " if data_var == 'C1':\n", - " ra.rasterize_cache(C1, field, res, method, reverse, cache)\n", + " ra.rasterize_cache(field, C1, res, method, reverse, cache) \n", " if data_var == 'C2':\n", - " ra.rasterize_cache(C2, field, res, method, reverse, cache)\n", + " ra.rasterize_cache(field, C2, res, method, reverse, cache)\n", " if data_var == 'C3':\n", - " ra.rasterize_cache(C3, field, res, method, reverse, cache)\n", + " ra.rasterize_cache(field, C3, res, method, reverse, cache)\n", " if data_var == 'C123':\n", - " ra.rasterize_cache(C123, field, res, method, reverse, cache)\n", + " ra.rasterize_cache(field, C123, res, method, reverse, cache)\n", " \n", - "pool = Pool(processes=5)\n", + "pool = Pool(processes=9)\n", "\n", "job_args = list()\n", "\n", "for res in (0.5, 1., 2., 3., 5., 10., .1):\n", " for reverse in (False, True):\n", - " for inter in ('linear', 'nearest'):\n", + " for inter in ('linear', 'nearest', 'cubic-clip'):\n", " for field in ('z', 'intensity', 'num_returns'):\n", " for data in ('C1', 'C2', 'C3', 'C123'):\n", - " job_args.append([data, field, res, inter, reverse, '../Res/HVR/'])\n", + " job_args.append([data, field, res, inter, reverse, '../Res/enrichment_rasters'])\n", + " \n", + "print(\"Job list length: {}\".format(len(job_args)))\n", " \n", "for i in pool.starmap(rasterize_cache_mp, job_args):\n", " pass"