From e7c812fa7727673870989fbebada0e3ddb22e06a Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 10:42:20 +0300 Subject: [PATCH 01/21] Remove python_version < '3.12' for tensorflow --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8937f6bb0dae..bb3d671393b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ rich scikit-learn statsmodels sympy -tensorflow ; python_version < '3.12' +tensorflow tweepy # yulewalker # uncomment once audio_filters/equal_loudness_filter.py is fixed typing_extensions From fb9115605aa4e286dbd97f221b41e02cff651e26 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 10:45:59 +0300 Subject: [PATCH 02/21] Reenable dynamic_programming/k_means_clustering_tensorflow.py --- ...ensorflow.py.DISABLED.txt => k_means_clustering_tensorflow.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dynamic_programming/{k_means_clustering_tensorflow.py.DISABLED.txt => k_means_clustering_tensorflow.py} (100%) diff --git a/dynamic_programming/k_means_clustering_tensorflow.py.DISABLED.txt b/dynamic_programming/k_means_clustering_tensorflow.py similarity index 100% rename from dynamic_programming/k_means_clustering_tensorflow.py.DISABLED.txt rename to dynamic_programming/k_means_clustering_tensorflow.py From 85f907079e0a0fbe319e8441492a9bbb1e2fb169 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 07:46:23 +0000 Subject: [PATCH 03/21] updating DIRECTORY.md --- DIRECTORY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/DIRECTORY.md b/DIRECTORY.md index b5392fd09114..a3d416220026 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -344,6 +344,7 @@ * [Floyd Warshall](dynamic_programming/floyd_warshall.py) * [Integer Partition](dynamic_programming/integer_partition.py) * [Iterating Through Submasks](dynamic_programming/iterating_through_submasks.py) + * [K Means Clustering Tensorflow](dynamic_programming/k_means_clustering_tensorflow.py) * [Knapsack](dynamic_programming/knapsack.py) * [Largest Divisible Subset](dynamic_programming/largest_divisible_subset.py) * [Longest Common Subsequence](dynamic_programming/longest_common_subsequence.py) From d37672a2c8db65c7d9b24756edced70627e84a19 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 10:56:53 +0300 Subject: [PATCH 04/21] Try to fix ruff --- ciphers/rsa_cipher.py | 17 +++++++---------- other/lfu_cache.py | 5 ++--- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ciphers/rsa_cipher.py b/ciphers/rsa_cipher.py index 9c41cdc5d472..3bc2ebe5fc74 100644 --- a/ciphers/rsa_cipher.py +++ b/ciphers/rsa_cipher.py @@ -76,11 +76,9 @@ def encrypt_and_write_to_file( key_size, n, e = read_key_file(key_filename) if key_size < block_size * 8: sys.exit( - "ERROR: Block size is {} bits and key size is {} bits. The RSA cipher " - "requires the block size to be equal to or greater than the key size. " - "Either decrease the block size or use different keys.".format( - block_size * 8, key_size - ) + f"ERROR: Block size is {block_size * 8} bits and key size is {key_size} " + "bits. The RSA cipher requires the block size to be equal to or greater " + "than the key size. Either decrease the block size or use different keys." ) encrypted_blocks = [str(i) for i in encrypt_message(message, (n, e), block_size)] @@ -102,11 +100,10 @@ def read_from_file_and_decrypt(message_filename: str, key_filename: str) -> str: if key_size < block_size * 8: sys.exit( - "ERROR: Block size is {} bits and key size is {} bits. The RSA cipher " - "requires the block size to be equal to or greater than the key size. " - "Did you specify the correct key file and encrypted file?".format( - block_size * 8, key_size - ) + f"ERROR: Block size is {block_size * 8} bits and key size is {key_size} " + "bits. The RSA cipher requires the block size to be equal to or greater " + "than the key size. Did you specify the correct key file and encrypted " + "file?" ) encrypted_blocks = [] diff --git a/other/lfu_cache.py b/other/lfu_cache.py index b68ba3a4605c..74ade70e860b 100644 --- a/other/lfu_cache.py +++ b/other/lfu_cache.py @@ -24,9 +24,8 @@ def __init__(self, key: T | None, val: U | None): self.prev: DoubleLinkedListNode[T, U] | None = None def __repr__(self) -> str: - return "Node: key: {}, val: {}, freq: {}, has next: {}, has prev: {}".format( - self.key, self.val, self.freq, self.next is not None, self.prev is not None - ) + return f"Node: key: {self.key}, val: {self.val}, freq: {lf.freq}, " + "has next: {self.next is not None}, has prev: {self.prev is not None}" class DoubleLinkedList(Generic[T, U]): From 49699af6443c5b35ed31f43c8205f3c06c2c7906 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 10:59:13 +0300 Subject: [PATCH 05/21] Try to fix ruff --- other/lfu_cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other/lfu_cache.py b/other/lfu_cache.py index 74ade70e860b..0da3aac31466 100644 --- a/other/lfu_cache.py +++ b/other/lfu_cache.py @@ -25,7 +25,7 @@ def __init__(self, key: T | None, val: U | None): def __repr__(self) -> str: return f"Node: key: {self.key}, val: {self.val}, freq: {lf.freq}, " - "has next: {self.next is not None}, has prev: {self.prev is not None}" + "has next: {self.next is not None}, has prev: {self.prev is not None}" class DoubleLinkedList(Generic[T, U]): From 66019e60bafb73b82499d84b71d0a07987b4bf38 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:00:02 +0300 Subject: [PATCH 06/21] Try to fix ruff --- other/lfu_cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other/lfu_cache.py b/other/lfu_cache.py index 0da3aac31466..a9d3c8869bdd 100644 --- a/other/lfu_cache.py +++ b/other/lfu_cache.py @@ -25,7 +25,7 @@ def __init__(self, key: T | None, val: U | None): def __repr__(self) -> str: return f"Node: key: {self.key}, val: {self.val}, freq: {lf.freq}, " - "has next: {self.next is not None}, has prev: {self.prev is not None}" + "has next: {self.next is not None}, has prev: {self.prev is not None}" class DoubleLinkedList(Generic[T, U]): From 1a1cb76b45bdd036cde23abd50bbcac86c4b0be8 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:03:16 +0300 Subject: [PATCH 07/21] Try to fix ruff --- other/lfu_cache.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/other/lfu_cache.py b/other/lfu_cache.py index a9d3c8869bdd..395f3c90261a 100644 --- a/other/lfu_cache.py +++ b/other/lfu_cache.py @@ -24,8 +24,8 @@ def __init__(self, key: T | None, val: U | None): self.prev: DoubleLinkedListNode[T, U] | None = None def __repr__(self) -> str: - return f"Node: key: {self.key}, val: {self.val}, freq: {lf.freq}, " - "has next: {self.next is not None}, has prev: {self.prev is not None}" + return f"Node: key: {self.key}, val: {self.val}, freq: {self.freq}, "\ + f"has next: {self.next is not None}, has prev: {self.prev is not None}" class DoubleLinkedList(Generic[T, U]): From 97b7f7bcd8cb52348c8ac2d53044dd7be1859a3b Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:05:08 +0300 Subject: [PATCH 08/21] Try to fix ruff --- other/lfu_cache.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/other/lfu_cache.py b/other/lfu_cache.py index 395f3c90261a..788fdf19bb60 100644 --- a/other/lfu_cache.py +++ b/other/lfu_cache.py @@ -24,8 +24,10 @@ def __init__(self, key: T | None, val: U | None): self.prev: DoubleLinkedListNode[T, U] | None = None def __repr__(self) -> str: - return f"Node: key: {self.key}, val: {self.val}, freq: {self.freq}, "\ - f"has next: {self.next is not None}, has prev: {self.prev is not None}" + return ( + f"Node: key: {self.key}, val: {self.val}, freq: {self.freq}, " + f"has next: {self.next is not None}, has prev: {self.prev is not None}" + ) class DoubleLinkedList(Generic[T, U]): From ab1f7cf89a6fe31fa90113a08cf793a953d81e4e Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:09:25 +0300 Subject: [PATCH 09/21] Reenable machine_learning/lstm/lstm_prediction.py --- .../lstm/{lstm_prediction.py.DISABLED.txt => lstm_prediction.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename machine_learning/lstm/{lstm_prediction.py.DISABLED.txt => lstm_prediction.py} (100%) diff --git a/machine_learning/lstm/lstm_prediction.py.DISABLED.txt b/machine_learning/lstm/lstm_prediction.py similarity index 100% rename from machine_learning/lstm/lstm_prediction.py.DISABLED.txt rename to machine_learning/lstm/lstm_prediction.py From 205c7b362a2c641cf5957d625d1c4e517035c032 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 08:09:38 +0000 Subject: [PATCH 10/21] updating DIRECTORY.md --- DIRECTORY.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DIRECTORY.md b/DIRECTORY.md index a3d416220026..d17b5d8db1b5 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -572,6 +572,8 @@ * [Local Weighted Learning](machine_learning/local_weighted_learning/local_weighted_learning.py) * [Logistic Regression](machine_learning/logistic_regression.py) * [Loss Functions](machine_learning/loss_functions.py) + * Lstm + * [Lstm Prediction](machine_learning/lstm/lstm_prediction.py) * [Mfcc](machine_learning/mfcc.py) * [Multilayer Perceptron Classifier](machine_learning/multilayer_perceptron_classifier.py) * [Polynomial Regression](machine_learning/polynomial_regression.py) From 2bc7a1edaa42104615623d4e465a492664b02177 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:12:13 +0300 Subject: [PATCH 11/21] Try to fix ruff --- machine_learning/lstm/lstm_prediction.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/machine_learning/lstm/lstm_prediction.py b/machine_learning/lstm/lstm_prediction.py index 16530e935ea7..ecbd451266ad 100644 --- a/machine_learning/lstm/lstm_prediction.py +++ b/machine_learning/lstm/lstm_prediction.py @@ -17,11 +17,11 @@ make sure you set the price column on line number 21. Here we use a dataset which have the price on 3rd column. """ - df = pd.read_csv("sample_data.csv", header=None) - len_data = df.shape[:1][0] + sample_data = pd.read_csv("sample_data.csv", header=None) + len_data = sample_data.shape[:1][0] # If you're using some other dataset input the target column - actual_data = df.iloc[:, 1:2] - actual_data = actual_data.values.reshape(len_data, 1) + actual_data = sample_data.iloc[:, 1:2] + actual_data = actual_data.to_numpy().reshape(len_data, 1) actual_data = MinMaxScaler().fit_transform(actual_data) look_back = 10 forward_days = 5 From 1992dad500ccc3d65b2bffbe8ce15258c1e423c4 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:16:23 +0300 Subject: [PATCH 12/21] Reenable computer_vision/cnn_classification.py --- .../{cnn_classification.py.DISABLED.txt => cnn_classification.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename computer_vision/{cnn_classification.py.DISABLED.txt => cnn_classification.py} (100%) diff --git a/computer_vision/cnn_classification.py.DISABLED.txt b/computer_vision/cnn_classification.py similarity index 100% rename from computer_vision/cnn_classification.py.DISABLED.txt rename to computer_vision/cnn_classification.py From 8e694e72e9829c3cfe66a17887fd927229bc5e54 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 08:16:38 +0000 Subject: [PATCH 13/21] updating DIRECTORY.md --- DIRECTORY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/DIRECTORY.md b/DIRECTORY.md index d17b5d8db1b5..b41e7c14914d 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -134,6 +134,7 @@ * [Run Length Encoding](compression/run_length_encoding.py) ## Computer Vision + * [Cnn Classification](computer_vision/cnn_classification.py) * [Flip Augmentation](computer_vision/flip_augmentation.py) * [Haralick Descriptors](computer_vision/haralick_descriptors.py) * [Harris Corner](computer_vision/harris_corner.py) From 4ba6638550800f263d2c3f606070631b4c746589 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:20:07 +0300 Subject: [PATCH 14/21] Reenable neural_network/input_data.py --- neural_network/{input_data.py.DEPRECATED.txt => input_data.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename neural_network/{input_data.py.DEPRECATED.txt => input_data.py} (100%) diff --git a/neural_network/input_data.py.DEPRECATED.txt b/neural_network/input_data.py similarity index 100% rename from neural_network/input_data.py.DEPRECATED.txt rename to neural_network/input_data.py From d3b154a9ea2e00d6039ee8753956c5ab2a1ba36f Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 08:20:38 +0000 Subject: [PATCH 15/21] updating DIRECTORY.md --- DIRECTORY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/DIRECTORY.md b/DIRECTORY.md index b41e7c14914d..2f828aa512a9 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -805,6 +805,7 @@ * [Swish](neural_network/activation_functions/swish.py) * [Back Propagation Neural Network](neural_network/back_propagation_neural_network.py) * [Convolution Neural Network](neural_network/convolution_neural_network.py) + * [Input Data](neural_network/input_data.py) * [Simple Neural Network](neural_network/simple_neural_network.py) ## Other From a326258978dad0feed330280a1dfcccbe1b49f25 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:22:25 +0300 Subject: [PATCH 16/21] Try to fix ruff --- neural_network/input_data.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neural_network/input_data.py b/neural_network/input_data.py index a58e64907e45..8d5e389f562f 100644 --- a/neural_network/input_data.py +++ b/neural_network/input_data.py @@ -21,6 +21,7 @@ import collections import gzip import os +import typing import urllib import numpy @@ -28,7 +29,7 @@ from tensorflow.python.platform import gfile from tensorflow.python.util.deprecation import deprecated -_Datasets = collections.namedtuple("_Datasets", ["train", "validation", "test"]) +_Datasets = typing.NamedTuple("_Datasets", ["train", "validation", "test"]) # CVDF mirror of http://yann.lecun.com/exdb/mnist/ DEFAULT_SOURCE_URL = "https://storage.googleapis.com/cvdf-datasets/mnist/" From 091dad9604d80caba83b72111706e7deed68dc57 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:22:55 +0300 Subject: [PATCH 17/21] Try to fix ruff --- neural_network/input_data.py | 1 - 1 file changed, 1 deletion(-) diff --git a/neural_network/input_data.py b/neural_network/input_data.py index 8d5e389f562f..3484f91890ff 100644 --- a/neural_network/input_data.py +++ b/neural_network/input_data.py @@ -18,7 +18,6 @@ """ -import collections import gzip import os import typing From b3b220cc44172fcb5211e731c2fbe33c6760025d Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:27:07 +0300 Subject: [PATCH 18/21] Try to fix mypy --- neural_network/input_data.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neural_network/input_data.py b/neural_network/input_data.py index 3484f91890ff..50df0b672c45 100644 --- a/neural_network/input_data.py +++ b/neural_network/input_data.py @@ -28,7 +28,8 @@ from tensorflow.python.platform import gfile from tensorflow.python.util.deprecation import deprecated -_Datasets = typing.NamedTuple("_Datasets", ["train", "validation", "test"]) +_Datasets = typing.NamedTuple( + "_Datasets", [("train", _DataSet), ("validation", _DataSet), ("test", _DataSet)]) # CVDF mirror of http://yann.lecun.com/exdb/mnist/ DEFAULT_SOURCE_URL = "https://storage.googleapis.com/cvdf-datasets/mnist/" From 61cbf90c416fa4eeec6b5db6a1ddaafb7c7f2287 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 08:27:32 +0000 Subject: [PATCH 19/21] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- neural_network/input_data.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neural_network/input_data.py b/neural_network/input_data.py index 50df0b672c45..e3ee1cf2bee0 100644 --- a/neural_network/input_data.py +++ b/neural_network/input_data.py @@ -29,7 +29,8 @@ from tensorflow.python.util.deprecation import deprecated _Datasets = typing.NamedTuple( - "_Datasets", [("train", _DataSet), ("validation", _DataSet), ("test", _DataSet)]) + "_Datasets", [("train", _DataSet), ("validation", _DataSet), ("test", _DataSet)] +) # CVDF mirror of http://yann.lecun.com/exdb/mnist/ DEFAULT_SOURCE_URL = "https://storage.googleapis.com/cvdf-datasets/mnist/" From ee241403f9637271bdb7ca603f5974ddf9e62e9c Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 11 Mar 2024 11:31:00 +0300 Subject: [PATCH 20/21] Try to fix ruff --- neural_network/input_data.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/neural_network/input_data.py b/neural_network/input_data.py index 50df0b672c45..41297b7d4086 100644 --- a/neural_network/input_data.py +++ b/neural_network/input_data.py @@ -28,8 +28,10 @@ from tensorflow.python.platform import gfile from tensorflow.python.util.deprecation import deprecated -_Datasets = typing.NamedTuple( - "_Datasets", [("train", _DataSet), ("validation", _DataSet), ("test", _DataSet)]) +class _Datasets(typing.NamedTuple): + train: "_DataSet" + validation: "_DataSet" + test: "_DataSet" # CVDF mirror of http://yann.lecun.com/exdb/mnist/ DEFAULT_SOURCE_URL = "https://storage.googleapis.com/cvdf-datasets/mnist/" From 205f6764826b4aa85c3b6456fcc5027a867c1e28 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 08:31:52 +0000 Subject: [PATCH 21/21] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- neural_network/input_data.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/neural_network/input_data.py b/neural_network/input_data.py index 41297b7d4086..2128449c03e9 100644 --- a/neural_network/input_data.py +++ b/neural_network/input_data.py @@ -28,10 +28,12 @@ from tensorflow.python.platform import gfile from tensorflow.python.util.deprecation import deprecated + class _Datasets(typing.NamedTuple): - train: "_DataSet" - validation: "_DataSet" - test: "_DataSet" + train: "_DataSet" + validation: "_DataSet" + test: "_DataSet" + # CVDF mirror of http://yann.lecun.com/exdb/mnist/ DEFAULT_SOURCE_URL = "https://storage.googleapis.com/cvdf-datasets/mnist/"