Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add ImageDataset and Layer for ConvolutionalNeuralNetworks #645

Merged
merged 49 commits into from
May 6, 2024
Merged

feat: Add ImageDataset and Layer for ConvolutionalNeuralNetworks #645

merged 49 commits into from
May 6, 2024

Commits on Apr 19, 2024

  1. feat: added ImageDataset 

    feat: added param to return filenames in `ImageList.from_files`
refactor: move `image.utils` to `image._utils`
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    bc33cc0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/Safe-DS/Stdlib into 579-add… 

    …-a-new-imagedataset-class

# Conflicts:
#	src/safeds/data/image/containers/_empty_image_list.py
#	src/safeds/data/image/containers/_image_list.py
#	src/safeds/exceptions/__init__.py
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    1dca8f0 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. feat: added Convolutional2DLayer, FlattenLayer, `MaxPooling2DLaye… 

    …r` and `AvgPooling2DLayer`

feat: added `InputConversionImage` and `OutputConversionImage`
feat: added class `ImageSize` and methods `ImageList.sizes` and `Image.size` to get the sizes of the respective images
feat: added ability to iterate over `SingleSizeImageList`
feat: added option `None` for no activation function in `ForwardLayer`
fix: fixed bug #581 in removing the Softmax function from the last layer in `NeuralNetworkClassifier`
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    312feec View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/Safe-DS/Stdlib into 579-add… 

    …-a-new-imagedataset-class
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    7b97fb7 View commit details
    Browse the repository at this point in the history

  3. test: fixed one test

    @Marsmaennchen221
    Marsmaennchen221 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    7ae5b56 View commit details
    Browse the repository at this point in the history

  4. test: added tests for ImageSize and Image.size 

    refactor: extracted test devices to `helpers.devices`
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    83a008e View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. test: added tests for ImageList.sizes 

    test: added test for activation function in `ForwardLayer`
test: added test for ImageToTable workflow of a cnn
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    cf7bfa4 View commit details
    Browse the repository at this point in the history

  2. feat: changed ImageDataset to have generic output type 

    feat: added `OutputConversionImageToTable` and `OutputConversionImageToImage`
feat: changed `OutputConversionImage` to be intern and abstract with generic `ImageDataset`
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    a40ed0e View commit details
    Browse the repository at this point in the history

  3. test: corrected test in ImageList

    @Marsmaennchen221
    Marsmaennchen221 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    9137eac View commit details
    Browse the repository at this point in the history

  4. test: corrected cnn workflow test to be os independent

    @Marsmaennchen221
    Marsmaennchen221 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    ac452e4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' of https://github.com/Safe-DS/Stdlib into 579-add… 

    …-a-new-imagedataset-class
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    3350ba6 View commit details
    Browse the repository at this point in the history

  6. feat: added ConvolutionalTranspose2DLayer 

    feat: added `OutputConversionImageToColumn`
feat: added `ImageDataset` with `Column` as output
feat: added kwargs to abstractmethod `_OutputConversion._data_conversion`
test: added test for cnn workflow to `Image` and `Column` output types
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    c3bcc20 View commit details
    Browse the repository at this point in the history

  7. test: made TestImageToColumn.test_should_train_and_predict_model os… 

    … independent
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    8312d99 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. feat: added Image.__array__ to convert a Image to a numpy.ndarray

    @Marsmaennchen221
    Marsmaennchen221 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    031677a View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. feat: added checks and errors for invalid CNNs 

    refactor: moved `ImageDataset` to `labeled.containers.ImageDataset`
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    c567b55 View commit details
    Browse the repository at this point in the history

  2. feat: added equals check to OneHotEncoder 

    test: added tests for `ImageDataset`, `InputConversionImage` and all `OutputConversionImage` variants
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    137d658 View commit details
    Browse the repository at this point in the history

  3. test: added tests for Convolutional2DLayer, `ConvolutionalTranspose… 

    …2DLayer`, `FlattenLayer`, `MaxPooling2DLayer` and `AvgPooling2DLayer`
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    732b1ce View commit details
    Browse the repository at this point in the history

  4. test: added tests for OneHotEncoder.__eq__ 

    test: added additional tests for codecov
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    cf497a4 View commit details
    Browse the repository at this point in the history

  5. refactor: ruff linter 

    docs: added docstrings
    @Marsmaennchen221
    Marsmaennchen221 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    4d07c6a View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. refactor: mypy linter

    @Marsmaennchen221
    Marsmaennchen221 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    99e0d54 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Merge branch 'main' of https://github.com/Safe-DS/Stdlib into 579-add… 

    …-a-new-imagedataset-class

# Conflicts:
#	src/safeds/data/labeled/containers/__init__.py
#	src/safeds/exceptions/_ml.py
#	src/safeds/ml/nn/_input_conversion.py
#	src/safeds/ml/nn/_model.py
#	src/safeds/ml/nn/_output_conversion.py
#	src/safeds/ml/nn/_output_conversion_table.py
#	tests/safeds/ml/nn/test_model.py
    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    75cce0a View commit details
    Browse the repository at this point in the history

  2. refactor: finish merge

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    a43ecda View commit details
    Browse the repository at this point in the history

  3. refactor: linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    e4e5239 View commit details
    Browse the repository at this point in the history

  4. refactor: linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    d87bc92 View commit details
    Browse the repository at this point in the history

  5. refactor: linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    5bdce23 View commit details
    Browse the repository at this point in the history

  6. refactor: mypy linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    032f58f View commit details
    Browse the repository at this point in the history

  7. refactor: mypy linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    4b30a58 View commit details
    Browse the repository at this point in the history

  8. refactor: mypy linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    33e8db8 View commit details
    Browse the repository at this point in the history

  9. refactor: mypy linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    19f1f24 View commit details
    Browse the repository at this point in the history

  10. refactor: mypy linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    5503312 View commit details
    Browse the repository at this point in the history

  11. refactor: mypy linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    aedf2be View commit details
    Browse the repository at this point in the history

  12. refactor: mypy linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    2953f36 View commit details
    Browse the repository at this point in the history

  13. refactor: mypy linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    0974807 View commit details
    Browse the repository at this point in the history

  14. style: apply automated linter fixes

    @megalinter-bot
    megalinter-bot committed May 1, 2024
    Configuration menu
    Copy the full SHA
    ff407cd View commit details
    Browse the repository at this point in the history

  15. refactor: ruff linter

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    8b50d3b View commit details
    Browse the repository at this point in the history

  16. style: apply automated linter fixes

    @megalinter-bot
    megalinter-bot committed May 1, 2024
    Configuration menu
    Copy the full SHA
    8bd40b1 View commit details
    Browse the repository at this point in the history

  17. refactor: codecov

    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    a1e7415 View commit details
    Browse the repository at this point in the history

  18. Merge branch '579-add-a-new-imagedataset-class' of https://github.com… 

    …/Safe-DS/Stdlib into 579-add-a-new-imagedataset-class
    @Marsmaennchen221
    Marsmaennchen221 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    c717cdc View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Merge branch 'main' of https://github.com/Safe-DS/Stdlib into 579-add… 

    …-a-new-imagedataset-class

# Conflicts:
#	src/safeds/ml/nn/__init__.py
#	src/safeds/ml/nn/_model.py
    @Marsmaennchen221
    Marsmaennchen221 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    5cf56cd View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. refactor: finish merge

    @Marsmaennchen221
    Marsmaennchen221 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    a3b9336 View commit details
    Browse the repository at this point in the history

  2. feat: added and improved various __hash__, __sizeof__ and `__eq__… 

    …` methods
    @Marsmaennchen221
    Marsmaennchen221 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    de465aa View commit details
    Browse the repository at this point in the history

  3. refactor: mypy

    @Marsmaennchen221
    Marsmaennchen221 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    3c800ea View commit details
    Browse the repository at this point in the history

  4. test: added missing tests

    @Marsmaennchen221
    Marsmaennchen221 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    c8437bb View commit details
    Browse the repository at this point in the history

  5. style: apply automated linter fixes

    @megalinter-bot
    megalinter-bot committed May 3, 2024
    Configuration menu
    Copy the full SHA
    3204c26 View commit details
    Browse the repository at this point in the history

  6. style: apply automated linter fixes

    @megalinter-bot
    megalinter-bot committed May 3, 2024
    Configuration menu
    Copy the full SHA
    b8cfd66 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. feat: disabled warning from OneHotEncoder in ImageDataset

    @Marsmaennchen221
    Marsmaennchen221 committed May 6, 2024
    Configuration menu
    Copy the full SHA
    16871cf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/Safe-DS/Stdlib into 579-add… 

    …-a-new-imagedataset-class

# Conflicts:
#	src/safeds/data/image/containers/_single_size_image_list.py
#	src/safeds/data/tabular/transformation/_one_hot_encoder.py
    @Marsmaennchen221
    Marsmaennchen221 committed May 6, 2024
    Configuration menu
    Copy the full SHA
    06e1af9 View commit details
    Browse the repository at this point in the history

  3. refactor: completed merge

    @Marsmaennchen221
    Marsmaennchen221 committed May 6, 2024
    Configuration menu
    Copy the full SHA
    0397251 View commit details
    Browse the repository at this point in the history

  4. style: apply automated linter fixes

    @megalinter-bot
    megalinter-bot committed May 6, 2024
    Configuration menu
    Copy the full SHA
    701091b View commit details
    Browse the repository at this point in the history