From cc1b43e07cbdf4d7dd0a484e88affaa4f1c4c68b Mon Sep 17 00:00:00 2001 From: Kadam Parikh <39589393+ParikhKadam@users.noreply.github.com> Date: Wed, 3 Apr 2019 22:00:47 +0530 Subject: [PATCH 1/5] [Solving Issue #50] The code took pad_to_length, pad_left and truncate_left as arguments but never used it which caused the issue reported here - https://github.com/plasticityai/magnitude/issues/50 This is an attempt to solve the above issue.. --- pymagnitude/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pymagnitude/__init__.py b/pymagnitude/__init__.py index c60f44b..d7c83e8 100644 --- a/pymagnitude/__init__.py +++ b/pymagnitude/__init__.py @@ -2082,7 +2082,13 @@ def query(self, q, pad_to_length=None, truncate_left = truncate_left or self.magnitudes[0].truncate_left # Query each model with the right set of keys - v = [m.query(self._take(q, multikey, i), normalized=( + v = [m.query(self._take(q, multikey, i), pad_to_length=( + pad_to_length if pad_to_length is not None else m.pad_to_length + ), pad_left=( + pad_left if pad_left is not None else m.pad_left + ), truncate_left=( + truncate_left if truncate_left is not None else m.truncate_left + ), normalized=( normalized if normalized is not None else m.normalized )) for i, m in enumerate(self.magnitudes)] From 92c3de04318c8615c8d0811d4cbecc2cf554fc8b Mon Sep 17 00:00:00 2001 From: Kadam Parikh <39589393+ParikhKadam@users.noreply.github.com> Date: Wed, 3 Apr 2019 22:11:42 +0530 Subject: [PATCH 2/5] [UPDATE] Removed unnecessary code --- pymagnitude/__init__.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pymagnitude/__init__.py b/pymagnitude/__init__.py index d7c83e8..641d285 100644 --- a/pymagnitude/__init__.py +++ b/pymagnitude/__init__.py @@ -2082,15 +2082,8 @@ def query(self, q, pad_to_length=None, truncate_left = truncate_left or self.magnitudes[0].truncate_left # Query each model with the right set of keys - v = [m.query(self._take(q, multikey, i), pad_to_length=( - pad_to_length if pad_to_length is not None else m.pad_to_length - ), pad_left=( - pad_left if pad_left is not None else m.pad_left - ), truncate_left=( - truncate_left if truncate_left is not None else m.truncate_left - ), normalized=( - normalized if normalized is not None else m.normalized - )) + v = [m.query(self._take(q, multikey, i), pad_to_length=pad_to_length, pad_left=pad_left, truncate_left=truncate_left, + normalized=(normalized if normalized is not None else m.normalized)) for i, m in enumerate(self.magnitudes)] if not isinstance(q, list): # Single key From a17d5c3d9c0903897b3d8c86de23a24dbe863fc3 Mon Sep 17 00:00:00 2001 From: Kadam Parikh <39589393+ParikhKadam@users.noreply.github.com> Date: Thu, 4 Apr 2019 21:55:14 +0530 Subject: [PATCH 3/5] [DEBUG CODE ADDED] Should be removed soon --- pymagnitude/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pymagnitude/__init__.py b/pymagnitude/__init__.py index 641d285..04139c1 100644 --- a/pymagnitude/__init__.py +++ b/pymagnitude/__init__.py @@ -2080,7 +2080,12 @@ def query(self, q, pad_to_length=None, pad_to_length = pad_to_length or self.magnitudes[0].pad_to_length pad_left = pad_left or self.magnitudes[0].pad_left truncate_left = truncate_left or self.magnitudes[0].truncate_left - + + # Debugging + print(pad_to_length) + print(pad_left) + print(truncate_left) + # Query each model with the right set of keys v = [m.query(self._take(q, multikey, i), pad_to_length=pad_to_length, pad_left=pad_left, truncate_left=truncate_left, normalized=(normalized if normalized is not None else m.normalized)) From 388be7ef3ad5946ddaaaac8cd153b2cf5849090e Mon Sep 17 00:00:00 2001 From: Kadam Parikh <39589393+ParikhKadam@users.noreply.github.com> Date: Sat, 6 Apr 2019 20:56:30 +0530 Subject: [PATCH 4/5] [REMOVED] Debug Code Working as expected.. --- pymagnitude/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pymagnitude/__init__.py b/pymagnitude/__init__.py index 04139c1..4137bc0 100644 --- a/pymagnitude/__init__.py +++ b/pymagnitude/__init__.py @@ -2081,11 +2081,6 @@ def query(self, q, pad_to_length=None, pad_left = pad_left or self.magnitudes[0].pad_left truncate_left = truncate_left or self.magnitudes[0].truncate_left - # Debugging - print(pad_to_length) - print(pad_left) - print(truncate_left) - # Query each model with the right set of keys v = [m.query(self._take(q, multikey, i), pad_to_length=pad_to_length, pad_left=pad_left, truncate_left=truncate_left, normalized=(normalized if normalized is not None else m.normalized)) From 2ba4c754087056cc4ac4545768d4243d94fe898d Mon Sep 17 00:00:00 2001 From: Kadam Parikh <39589393+ParikhKadam@users.noreply.github.com> Date: Mon, 8 Apr 2019 15:08:43 +0530 Subject: [PATCH 5/5] [DEBUG] pip install via branch name Will get undo soon --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 387988e..322d6e7 100644 --- a/version.py +++ b/version.py @@ -1,2 +1,2 @@ -__version_info__ = ('0', '1', '120') +__version_info__ = ('0', '1', '121') __version__ = '.'.join(__version_info__)