add similarity_search.py in machine_learning#3864
Merged
cclauss merged 8 commits intoTheAlgorithms:masterfrom Nov 13, 2020
Merged
add similarity_search.py in machine_learning#3864cclauss merged 8 commits intoTheAlgorithms:masterfrom
cclauss merged 8 commits intoTheAlgorithms:masterfrom
Conversation
adding similarity_search algorithm in machine_learning
Member
|
Please format your code with psf/black as discussed in CONTRIBUTING.md. |
Member
|
mrmaxguns
suggested changes
Nov 5, 2020
| return None | ||
|
|
||
|
|
||
| def similarity_search(dataset: np, value: np) -> list: |
Member
There was a problem hiding this comment.
These type hints seem off. Do the arguments dataset and value require the numpy module type? This should probably changed to:
def similarity_search(dataset: np.ndarray, value: np.ndarray) -> list:
...isort, codespell changed. applied feedback(np -> np.ndarray)
add type hints to euclidean method
cclauss
requested changes
Nov 6, 2020
Comment on lines
+75
to
+78
| "Wrong input data's shape... dataset : ", | ||
| dataset.shape[1], | ||
| ", value : ", | ||
| value.shape[1], |
Comment on lines
+86
to
+89
| "Input data have different datatype... dataset : ", | ||
| dataset.dtype, | ||
| ", value : ", | ||
| value.dtype, |
- changed euclidean's type hints - changed few TypeError to ValueError - changed range(len()) to enumerate() - changed error's strings to f-string - implemented without type() - add euclidean's explanation
cclauss
requested changes
Nov 11, 2020
Member
cclauss
left a comment
cclauss
left a comment
There was a problem hiding this comment.
Use iteration of keys, values, and items more and use indexes less.
| dist = 0 | ||
|
|
||
| try: | ||
| for index, v in enumerate(input_a): |
Member
There was a problem hiding this comment.
We should be zip() ing these lists together.
| raise TypeError("Euclidean's input types are not right ...") | ||
|
|
||
|
|
||
| def similarity_search(dataset: np.ndarray, value: np.ndarray) -> list: |
Member
There was a problem hiding this comment.
Suggested change
| def similarity_search(dataset: np.ndarray, value: np.ndarray) -> list: | |
| def similarity_search(dataset: np.ndarray, value_array: np.ndarray) -> list: |
This is not a single value but an array of values.
| import numpy as np | ||
|
|
||
|
|
||
| def euclidean(input_a: np.ndarray, input_b: np.ndarray): |
Member
There was a problem hiding this comment.
Suggested change
| def euclidean(input_a: np.ndarray, input_b: np.ndarray): | |
| def euclidean(input_a: np.ndarray, input_b: np.ndarray) -> float: |
Comment on lines
+49
to
+51
| >>> a = np.array([[0], [1], [2]]) | ||
| >>> b = np.array([[0]]) | ||
| >>> similarity_search(a, b) |
Member
There was a problem hiding this comment.
Suggested change
| >>> a = np.array([[0], [1], [2]]) | |
| >>> b = np.array([[0]]) | |
| >>> similarity_search(a, b) | |
| >>> dataset = np.array([[0], [1], [2]]) | |
| >>> value_array = np.array([[0]]) | |
| >>> similarity_search(dataset, value_array) |
Repeat for other these below...
Please add tests that raise errors.
Comment on lines
+94
to
+103
| for index, v in enumerate(value): | ||
| dist = euclidean(value[index], dataset[0]) | ||
| vector = dataset[0].tolist() | ||
|
|
||
| for index2 in range(1, len(dataset)): | ||
| temp_dist = euclidean(value[index], dataset[index2]) | ||
|
|
||
| if dist > temp_dist: | ||
| dist = temp_dist | ||
| vector = dataset[index2].tolist() |
Member
There was a problem hiding this comment.
Suggested change
| for index, v in enumerate(value): | |
| dist = euclidean(value[index], dataset[0]) | |
| vector = dataset[0].tolist() | |
| for index2 in range(1, len(dataset)): | |
| temp_dist = euclidean(value[index], dataset[index2]) | |
| if dist > temp_dist: | |
| dist = temp_dist | |
| vector = dataset[index2].tolist() | |
| for value in value_array.values(): | |
| dist = euclidean(value, dataset[0]) | |
| vector = dataset[0].tolist() | |
| for dataset_value in dataset[1:].values(): | |
| temp_dist = euclidean(value, dataset_value) | |
| if dist > temp_dist: | |
| dist = temp_dist | |
| vector = dataset_value.tolist() |
Member
|
Please add some tests that raise errors like https://github.com/TheAlgorithms/Python/blob/master/arithmetic_analysis/bisection.py does and then I think we are ready to merge this one. |
- deleted try/catch in euclidean - added error tests - name change(value -> value_array)
cclauss
reviewed
Nov 13, 2020
Contributor
Author
|
@cclauss When adding error examples, one of the examples couldn't pass flake8. Is there any ways to avoid this? |
stokhos
pushed a commit
to stokhos/Python
that referenced
this pull request
Jan 3, 2021
* add similarity_search.py in machine_learning adding similarity_search algorithm in machine_learning * fix pre-commit test, apply feedback isort, codespell changed. applied feedback(np -> np.ndarray) * apply feedback add type hints to euclidean method * apply feedback - changed euclidean's type hints - changed few TypeError to ValueError - changed range(len()) to enumerate() - changed error's strings to f-string - implemented without type() - add euclidean's explanation * apply feedback - deleted try/catch in euclidean - added error tests - name change(value -> value_array) * # doctest: +NORMALIZE_WHITESPACE * Update machine_learning/similarity_search.py * placate flake8 Co-authored-by: Christian Clauss <cclauss@me.com>
peRFectBeliever
pushed a commit
to peRFectBeliever/Python
that referenced
this pull request
Apr 1, 2021
* add similarity_search.py in machine_learning adding similarity_search algorithm in machine_learning * fix pre-commit test, apply feedback isort, codespell changed. applied feedback(np -> np.ndarray) * apply feedback add type hints to euclidean method * apply feedback - changed euclidean's type hints - changed few TypeError to ValueError - changed range(len()) to enumerate() - changed error's strings to f-string - implemented without type() - add euclidean's explanation * apply feedback - deleted try/catch in euclidean - added error tests - name change(value -> value_array) * # doctest: +NORMALIZE_WHITESPACE * Update machine_learning/similarity_search.py * placate flake8 Co-authored-by: Christian Clauss <cclauss@me.com>
Panquesito7
pushed a commit
to Panquesito7/Python
that referenced
this pull request
May 13, 2021
* add similarity_search.py in machine_learning adding similarity_search algorithm in machine_learning * fix pre-commit test, apply feedback isort, codespell changed. applied feedback(np -> np.ndarray) * apply feedback add type hints to euclidean method * apply feedback - changed euclidean's type hints - changed few TypeError to ValueError - changed range(len()) to enumerate() - changed error's strings to f-string - implemented without type() - add euclidean's explanation * apply feedback - deleted try/catch in euclidean - added error tests - name change(value -> value_array) * # doctest: +NORMALIZE_WHITESPACE * Update machine_learning/similarity_search.py * placate flake8 Co-authored-by: Christian Clauss <cclauss@me.com>
shermanhui
pushed a commit
to shermanhui/Python
that referenced
this pull request
Oct 22, 2021
* add similarity_search.py in machine_learning adding similarity_search algorithm in machine_learning * fix pre-commit test, apply feedback isort, codespell changed. applied feedback(np -> np.ndarray) * apply feedback add type hints to euclidean method * apply feedback - changed euclidean's type hints - changed few TypeError to ValueError - changed range(len()) to enumerate() - changed error's strings to f-string - implemented without type() - add euclidean's explanation * apply feedback - deleted try/catch in euclidean - added error tests - name change(value -> value_array) * # doctest: +NORMALIZE_WHITESPACE * Update machine_learning/similarity_search.py * placate flake8 Co-authored-by: Christian Clauss <cclauss@me.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
adding similarity_search algorithm in machine_learning
Describe your change:
Checklist:
Fixes: #{$ISSUE_NO}.