Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
ab18512
Update issue templates
tmiosmauli Feb 2, 2024
074fa5a
Scaffold out Agterberg-Cheng CI test.
Mar 6, 2024
5ab2820
Work on the Agterberg-Cheng CI test.
Mar 6, 2024
85169ab
Add a summary message to return values.
Mar 6, 2024
a2b5530
Exception handling.
Mar 6, 2024
105edb1
Minor cleanup + improve documentation.
Mar 6, 2024
bc5468e
Some modifications to output message.
Mar 7, 2024
59b9569
Update WofE notebook.
Mar 7, 2024
b9de4ac
Modification to output message.
Mar 7, 2024
587efd5
Add function with different options for generalizing cumulative weights.
Mar 12, 2024
b3c78a5
Warn instead of raising exception if classification fails.
Mar 13, 2024
38179f4
Drop any old generalized columns before redoing generalization.
Mar 13, 2024
acc8972
Perform the generalized weights calculation after assigning classes.
Mar 13, 2024
39fda60
Use the new generalization method in place of the old ones for cumula…
Mar 14, 2024
9286e84
Fix typo. Fix tests. Remove old functions.
Mar 14, 2024
ec4268e
Update docstring.
Mar 15, 2024
60dd809
Adhere to toolkit style of separating function into user-facing and n…
Mar 15, 2024
609dff0
Set default option for classification method.
Mar 15, 2024
b2adb70
Merge branch 'master' into 227-weights-generalization-improvements
Mar 15, 2024
b6d58c5
Distance computation optimization WIP. The optimized version is not w…
nmaarnio May 2, 2024
059410c
added functions distance_to_anomaly_gdal_ComputeProximity and _distan…
okolekar Aug 30, 2024
c422e64
added function distance_to_anomaly_gdal_ComputeProximity function for…
okolekar Sep 5, 2024
003d213
Added tests to check the new implemented functions
okolekar Sep 11, 2024
9581b74
feat(exploratory-analyses): add band parameter to descriptive statist…
nmaarnio Sep 17, 2024
e80a11d
Enable ubuntu conda test (#429)
nmaarnio Sep 17, 2024
b95f3d0
fix: remove raster file added by accident, update version
nmaarnio Sep 17, 2024
d36dad2
Merge pull request #428 from GispoCoding/427-add-band-selection-to-de…
nmaarnio Sep 18, 2024
5d93c8c
fix: fix type hint from float to Number
nmaarnio Sep 18, 2024
014fc78
fix: fix type hint from float to Number
nmaarnio Sep 18, 2024
60d44cd
chore: Bump version to 1.0.2
nmaarnio Sep 19, 2024
6c8596d
"Added test to test the new gdal ComputeProximity function "Merge rem…
okolekar Sep 24, 2024
1f09228
Added the new proximity tool to invert the 0's and 1's in the polygon…
okolekar Sep 25, 2024
9e75fb6
The tool now takes in a GeoDataFrame, raster profile and maximum dist…
okolekar Oct 1, 2024
4e5d68b
build(environment): remove defaults channel
nialov Oct 8, 2024
d486d7c
docs(readme): remove reference to defaults
nialov Oct 8, 2024
8d91ef5
Merge pull request #434 from nialov/433-remove-defaults-conda-channel
nmaarnio Oct 9, 2024
a4290e0
fix(transformations): skip nodata handling when nodata is not given o…
nmaarnio Oct 17, 2024
efddf23
feat(transformations): allow min-max scaling with min>max parameter v…
nmaarnio Oct 17, 2024
eac99a2
Made the recommended changes: list in the description
okolekar Oct 17, 2024
bc957c6
Added the linear transformation tool with the recommended changes wit…
okolekar Oct 17, 2024
7613375
Merge pull request #436 from GispoCoding/435-transformation-tools-fai…
nmaarnio Oct 18, 2024
3098259
Updated the requested changes
okolekar Oct 18, 2024
112002a
Merge pull request #432 from okolekar/#405-Add-Invert-data-tool-or-mo…
nmaarnio Oct 18, 2024
9419dfa
fix: fix docstring formating, removed unused param
nmaarnio Oct 18, 2024
770ce79
fix: fix proximity computation test after param update
nmaarnio Oct 18, 2024
9a78203
feat(cli): Add proximity computation CLI function
nmaarnio Oct 22, 2024
fc1df1e
Update tool-request.md
nmaarnio Oct 22, 2024
c6c6601
add bug report template
nmaarnio Oct 22, 2024
118c2bf
modify feature request template
nmaarnio Oct 22, 2024
66d9aca
Merge pull request #317 from GispoCoding/new-tool-issue-template
nmaarnio Oct 22, 2024
f29356d
Made requested changes refer below for details
okolekar Oct 22, 2024
dd2dea6
Merge pull request #438 from GispoCoding/add_proximity_computation_CL…
nmaarnio Oct 22, 2024
adb6380
Merge pull request #343 from GispoCoding/338-agterberg-cheng-CI-test
nmaarnio Oct 23, 2024
051f19b
Merge pull request #355 from GispoCoding/227-weights-generalization-i…
nmaarnio Oct 23, 2024
c66cd68
Merge pull request #423 from okolekar/384-optimize-distance-computation
nmaarnio Oct 23, 2024
e8879e4
Comment out unused code, reorder code
nmaarnio Oct 23, 2024
f124c2d
rename optimized variant of distance_to_anomaly
nmaarnio Oct 23, 2024
ccc9675
fix(raster_processing): add missing max_distance parameter in distanc…
nmaarnio Oct 23, 2024
384f829
feat(CLI): use distance_to_anomaly_gdal in CLI for Windows users
nmaarnio Oct 23, 2024
8e2c2a4
build: pin fiona to <=1.9.6
nmaarnio Oct 23, 2024
027de18
cli: revert running distance_to_anomaly_gdal automatically for window…
nmaarnio Oct 23, 2024
4b86481
Revert "build: pin fiona to <=1.9.6"
nmaarnio Oct 23, 2024
ceb9752
cli: revert running distance_to_anomaly_gdal automatically for window…
nmaarnio Oct 23, 2024
a6423ee
fix, feat(exploratory-analyses): correct PCA outputs, add principal c…
nmaarnio Oct 25, 2024
1f908d8
test(exploratory-analyses): update PCA tests
nmaarnio Oct 25, 2024
82db606
cli: update PCA CLI functions
nmaarnio Oct 25, 2024
d6b8fdf
439 add proximity to anomaly tool (#440)
nmaarnio Oct 25, 2024
dfd3bbd
fix(cli): fix proximity computation parameter name and description
nmaarnio Oct 28, 2024
ccc2dad
Merge pull request #446 from GispoCoding/445-fixmodify-pca-tools
nmaarnio Oct 28, 2024
8007217
chore: Bump version to 1.0.3
nmaarnio Oct 28, 2024
0ac4575
fix: winsorize issue when only one percentile is given
nmaarnio Nov 6, 2024
f42260e
build: pin scipy to 1.11.4, update pyproject and poetry lock (#451)
nmaarnio Nov 6, 2024
00d52de
Fix Local Moran's I input column checking and exceptions docs (#453)
nmaarnio Nov 6, 2024
1e23b65
chore: Bump to version 1.1.0
nmaarnio Nov 7, 2024
57a6c39
Revert "Update example notebook."
jtlait Nov 11, 2024
49c6917
Revert "Improve docstring."
jtlait Nov 11, 2024
3722316
Revert "Remove check for simplex sample space from coda transformatio…
jtlait Nov 11, 2024
3f80048
reverted back to include checks for simplex space. Changed closure ch…
jtlait Nov 13, 2024
1783195
fix(cli): fix saving plots when they are also shown immediately
nmaarnio Nov 15, 2024
ce6414f
perf, build(vector_processing): add optimized version of distance com…
Nov 15, 2024
59bbda1
chore: Bump to version 1.1.1
nmaarnio Nov 15, 2024
771efd4
test(pca_test): relax nan and nodata tests
nialov Nov 25, 2024
6bee396
test(raster_test): move raster path variable from pca_test
nialov Nov 25, 2024
5ca25b3
466 add feature importance CLI and modify tool (#468)
Dec 4, 2024
890fcf2
feat(IDW): Add search radius parameter
mipeso Dec 2, 2024
3db18bd
chore: Bump to version 1.1.2
nmaarnio Dec 9, 2024
b8ae3de
added closure checks also when geochemical data that is in ppm or ppb
jtlait Dec 13, 2024
4b049f7
Add WofE CLI functions (#475)
Jan 8, 2025
59165b5
fix: fix output rasters stdout message for wofe calculate weights CLI…
nmaarnio Jan 8, 2025
17b26f8
Update README.md
nmaarnio Jan 9, 2025
f6fac24
fix: fix nodata handling in wofe CLI functions
nmaarnio Jan 8, 2025
417e74a
Wofe CLI fixes (#482)
nmaarnio Feb 11, 2025
f51a363
disable failing tests
nmaarnio Feb 11, 2025
d8884e2
feat: Add tool to replace pixel values with nodata
mipeso Feb 12, 2025
46cc25c
chore: Bump to version 1.1.3
nmaarnio Feb 13, 2025
9b59a07
Improve CLI feedback with log functions
mipeso Mar 20, 2025
bfa801a
Improve logging
mipeso Mar 24, 2025
941d087
move toggle_gdal_exceptions to it's own module
nmaarnio Mar 24, 2025
131cb5e
perf: distance tools now rely on distance_to_anomaly that uses fast '…
nmaarnio Mar 24, 2025
114004d
test: update distance tool tests
nmaarnio Mar 24, 2025
eb11a1f
update distance tool CLI functions
nmaarnio Mar 24, 2025
262ee81
build: restrict Fiona to 1.9.6
okolekar Mar 25, 2025
82bc314
feat(training_data_tools): add Points to raster and Generate negative…
okolekar Mar 25, 2025
af4090c
feat(utils): add utility function for generating a full base raster p…
nmaarnio Mar 25, 2025
db43b16
style: small docstring and param name modifications
nmaarnio Mar 25, 2025
8dd7250
feat(CLI): add Points to raster CLI function
nmaarnio Mar 25, 2025
fb1eb7f
feat(CLI): add Generate negatives CLI function
nmaarnio Mar 25, 2025
6dc0623
Fix and improve Points to raster and Generate negatives (#502)
okolekar Mar 31, 2025
0bbf94c
Added check: Application of radius to a non square pixel raster raise…
okolekar Mar 31, 2025
6fdd30b
fix, feat: remove gauss resampling (not available for rasterio.warp),…
nmaarnio Mar 31, 2025
1dbb6cd
fix sending multiple out rasters via CLI
nmaarnio Apr 8, 2025
08e4323
fix reproject raster available resampling methods
nmaarnio Apr 8, 2025
2171c2f
fix wofe CLI function
nmaarnio Apr 8, 2025
1b7ab36
chore: Bump to version 1.1.4
nmaarnio Apr 8, 2025
ad620fc
Update README.md
nmaarnio Apr 8, 2025
14def07
Update README.md
nmaarnio Apr 8, 2025
a95d0e0
Update README
nmaarnio Apr 8, 2025
73fdfc6
fix(CLI): recompute raster statistics for each output raster in CLI
nmaarnio Apr 14, 2025
61a2032
fix(CLI): make sure all platforms can read the CLI messages
nmaarnio May 2, 2025
1ae85c4
chore: Bump to version 1.1.5
nmaarnio May 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: "Bug report"
about: Report a bug or other issue
title: "[Bug]: "
labels: bug
assignees: ''

---

**Describe the bug**
Describe what the bug or issue is about concisely.

**How to reproduce the bug**
Steps to reproduce the behavior:

**Expected behavior**
Describe what you expected to happen.

**Environment details**
- OS: [e.g., Windows, MacOS]
- Python Version: [e.g., 3.9]
- Package Version: [e.g., 1.2.0]

**Additional information**
Add any other context about the problem here. Screenshots or other additional information can be attached too.
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/tool-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Tool request
about: Suggest a new tool to EIS toolkit
title: "[New tool] -"
labels: enhancement
assignees: ''

---

**Tool description**
Please describe what the tool does. Ex. "This tool calculates distances to known deposits"

**Justification and importance**
Please give reasoning why the tool is needed. Is the tool essential or a nice-to-have?

**Tool category and type**
The current categories are the directories under `eis_toolkit` package in this repository. You may also suggest a new category if a suitable one doesn't exist.

**Implementation details**
What does the tool take as input and what is its output? Ex. "The tool takes raster data as input and outputs decimal numbers as an array". Is there a ready made library that already contains the desired functionality or should it be implemented from scratch? Is the library already part of EIS toolkit?

**Who will implement the tool?**
Are you ready to implement the tool yourself or will you hope someone else to do it?

**Additional information**
Any additional information e.g. usage examples, screenshots, links to scientific studies and other documents.
9 changes: 7 additions & 2 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ name: Conda
on:
pull_request:
push:
branches: [master, main]
# branches: [master, main]
branches: [main]
jobs:
conda-test:
name: Conda Install & Test
strategy:
fail-fast: false
matrix:
python-version: ["3.9"]
platform: ["ubuntu-latest", "windows-latest"]
platform: ["ubuntu-latest"]

runs-on: ${{ matrix.platform }}
defaults:
Expand All @@ -27,6 +28,9 @@ jobs:
auto-activate-base: false
mamba-version: "*"
channel-priority: true
- name: Set GDAL environment variable for Windows
if: runner.os == 'Windows'
run: echo "USE_PATH_FOR_GDAL_PYTHON=YES" >> $GITHUB_ENV
- name: Print conda environment
run: |
# Print environment
Expand All @@ -39,3 +43,4 @@ jobs:
python -c 'import eis_toolkit'
# Run unittests with pytest
pytest -v

3 changes: 2 additions & 1 deletion .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
on:
pull_request:
push:
branches: [master, main]
# branches: [master, main]
branches: [main]
jobs:
docker-test:
name: Docker install and test
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,6 @@ cython_debug/
tests/data/local/**
!tests/data/local/**/
!tests/data/local/**/.gitkeep

#configuration files
.vscode/launch.json
15 changes: 2 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
·
<a href="#usage">Usage</a>
·
<a href="#roadmap">Roadmap</a>
·
<a href="#contributing">Contributing</a>
·
<a href="#license">License</a>
Expand All @@ -34,11 +32,11 @@
EIS Toolkit is a comprehensive Python package for mineral prospectivity mapping and analysis. EIS Toolkit is developed as part of [EIS Horizon EU project](https://eis-he.eu/), which aims to aid EU's efforts in the green transition by securing critical raw materials. EIS Toolkit serves both as a standalone library that brings together and implements relevant tools for mineral prospectivity mapping and as a computational backend for [EIS QGIS Plugin](https://github.com/GispoCoding/eis_qgis_plugin).

> [!NOTE]
> This repository is still in development. Check the [wiki page of EIS Toolkit](https://github.com/GispoCoding/eis_toolkit/wiki) for list of tools and [roadmap](#roadmap) for more details about the project.
> This repository is still in development. Check the [wiki page of EIS Toolkit](https://github.com/GispoCoding/eis_toolkit/wiki) for list of tools.


## Installation
We recommend installing EIS Toolkit in an empty virtual environment to ensure compatibility between package versions.
EIS Toolkit requires Python 3.9 or 3.10. We recommend installing EIS Toolkit in an empty virtual environment to ensure compatibility between package versions.

EIS Toolkit is available in conda-forge and PyPI and can be installed with one of the following commands.

Expand All @@ -48,10 +46,6 @@ pip install eis_toolkit

```console
conda install -c conda-forge eis_toolkit
# On Windows, tensorflow must be installed from the anaconda channel
# Consequently, channel priority must be flexible, which can be explicitly
# done using --no-channel-priority
conda install -c conda-forge eis_toolkit --no-channel-priority
```

A Python wheel can be downloaded also from the [releases page](https://github.com/GispoCoding/eis_toolkit/releases) of this GitHub repository.
Expand Down Expand Up @@ -101,11 +95,6 @@ eis <tool-name> --help
> [!NOTE]
> Please note that the CLI has been primarily designed to communicate with external programs and may be clunky in direct use.

## Roadmap

- Milestone 1: **Beta release 0.1** (November 2023). The toolkit should have the basic funtionalities required for a full MPM workflow. Official testing phase begins. The plugin will be still under active development.
- Milestone 2: **Release 1.0** (May 2024). Most features should be incorporated at this time and the toolkit useful for actual MPM work. Testing will continue, more advanced methods added and the user experience refined.

## Contributing

We welcome contributions to EIS Toolkit in various forms:
Expand Down
Binary file removed cba_out.tif
Binary file not shown.
3 changes: 3 additions & 0 deletions docs/raster_processing/proximity_to_anomaly.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Proximity to anomaly

::: eis_toolkit.raster_processing.proximity_to_anomaly
3 changes: 3 additions & 0 deletions docs/training_data_tools/points_to_raster.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Points to raster

::: eis_toolkit.training_data_tools.points_to_raster
3 changes: 3 additions & 0 deletions docs/training_data_tools/random_sampling.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Random sampling

::: eis_toolkit.training_data_tools.random_sampling
3 changes: 3 additions & 0 deletions docs/vector_processing/proximity_computation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Proximity computation

::: eis_toolkit.vector_processing.proximity_computation
2 changes: 1 addition & 1 deletion eis_toolkit/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.1.0"
__version__ = "1.1.5"
Loading