From 62288bff9392d1063993ce60c8894e4b880551b3 Mon Sep 17 00:00:00 2001 From: YileAllenChen1 Date: Tue, 13 Oct 2020 09:46:26 -0500 Subject: [PATCH] fix BKFilter pull conflict Former-commit-id: 3f0ddddb6d86071e22abc0eba83f4342ef6a748d [formerly edb75f2b5aff64e9e940fcfada39c5c284739a74] [formerly d72390159b7bee4868714e522824815e0b1d816b [formerly d87c1e22191a214a2d2b9b8cf4913cc6cc135a51]] [formerly 3ebf04a131f56d4b63db64f3063becfcfb70b1cb [formerly cf204bb9cf11c64343ff47c77a0ae1b01b5ad70e] [formerly 8cbbe4911f1fc7fac9143dcc90f7d6a367b6c994 [formerly 1c7e4f2016584c2b9f7d6624f2b7a124aeccc55b]]] [formerly 72a6c31a729bf23ac2361a6a1bee1bcde4d177cf [formerly 28d11e23e88f5b22f7ce6f8b116620d5de0f1e7a] [formerly e70c674a31520d1e13b1b45ecbb38f20dad48e5c [formerly bca9e9ef82cd674b3a4b2853e5bc298b8ac22696]] [formerly f708bcbbf8a99a4c642fdc88f3a09b221d912b5b [formerly cd875157b66322d7d7bf948420a9f2b6dc323af4] [formerly ccf8f1276570f499ec8d82f870a776194600e83d [formerly 8e5d9a20fd07e2d4af92babb0fb3762e55783a35]]]] [formerly e7864acd325eb650123d63a091ad623b88e2530d [formerly 4db14deb3030b548e6ddc98cbcef83a8aa4ebcd4] [formerly 2d0aaaade32d1187af161630346b9bedf6594151 [formerly 532bf38bbfc62842b1e7a6ba8c1823e9bcae9744]] [formerly eea920e915633ebd724a2ab53a42779cd98fd2f5 [formerly 538bd87326e7630c040be531c26958d66050eaf6] [formerly a3d8a08bae1ad571e0ed2fc283bb3e8e9b63b57e [formerly e2e4dcbed4b2275a64c9572f4dfaaab1d1739463]]] [formerly 027397c00ebaee022af5f74fadfb004560b93769 [formerly fd8be3e37121194450d19bd09d407c5ed9522050] [formerly f4929aff7a57ac047ae8bf5fdf078bfddd2a79c8 [formerly 6bc0c5e74310725eb26840528b0bf52691b6e5a5]] [formerly 22c08349bb911261c6dfe35183e6e79e01dc8d34 [formerly dca63ab4d736cd2567e298c4126b193a74a976ba] [formerly 546f064d30c798a9de19ef19bf53117fbbeb5c86 [formerly a15834dc62c48c78d913367cd15ac650079ae8a5]]]]] [formerly 760aa21a4584b5f297d57d4bcd2f3903369f7712 [formerly 9be12db4002cdd54c000073391349a75f11a6f17] [formerly 62f7e06d882aaf75e4c7f01d95cc37451960d1c2 [formerly b5d02b6624be457064b6697c02e93d97b7ef077b]] [formerly 46ee20cc9d8d7ba153120a295b3fa1face8442e4 [formerly eddaae82fece8efb6558f0a36ab3ac6318c16197] [formerly 01891140a25871de3d1f4142a546ed49ca11e684 [formerly cc2289cce6168c964fc993135208b134de09acf5]]] [formerly 1c24677034ff625a58431b73c11fe6250de6c238 [formerly fb7e7e4f15c2ebd62df3a42c3352eb40195ccce3] [formerly 6b8565092cf51d83530f52d5e1f88e5280e56f0c [formerly ea121ad5b8accf660f8d7839054f38b65fa00641]] [formerly b9501f39fac4e28399c1a512cd2d0c852e1e5e44 [formerly 05ac31be517ede54d2f55ecb95099b6a70fa5939] [formerly 1bcc7289026d4969cf09b7169808baf1d0c06879 [formerly 0f92578ce0ebe11c4dade82e3dabfa84a0c4318d]]]] [formerly e8e39cdc985cfceae621f0bbdf59f36c5faf6c6a [formerly f0ca8bc0b3e40bd99d1fd5def6296e41f762de3f] [formerly d7d372efd584f168538a1ed90d6969c1d3feac3c [formerly 6b7a7d861a6fd6d902d7b3f42f28b928c41b561c]] [formerly 34f41d2ebc6cfcfe34374727339074a39b220854 [formerly 63d15c183610ccd4140a1b7626ce038711a22062] [formerly 4e22463db14a756d5ea17cac76e3496fab020c9e [formerly 837bb738bf83ad2d12556228713dae8a198ed570]]] [formerly fac046e27b50b635bc35e5e5e5a8220a884454ae [formerly 6d7d3095111cc183ca88aac01ebe9da59aece8be] [formerly c3565d8611bb5e8028686d04b0554539c4066241 [formerly 748b61be64e8d455620e3dc4cd16dc30908a25f4]] [formerly e986f036b97a630ef07ba807b6d24e21c47f6ebe [formerly b8fb642ecd168d1f106d6edee66f778ea32e87fb] [formerly e55fd6c32c0852bb27a9011ef5e0fcd8bde6c8a4 [formerly ffdd16e3193ac37ad7b7c6da7d17d1095ce4aac5]]]]]] Former-commit-id: 7dfec19434066ab314abb2473c28458b50f664fd [formerly 8301a8933d1b45a67433ef20fcbfa814a8c452e9] [formerly 4e42150d6349fdf2dff37238e427317aeeadb700 [formerly 1bf0e1c7497f231bf4cc80138c432fc72124367b]] [formerly c9ce7b2546c7ad121a998ef6cc5f8761a39ae058 [formerly 67e5389ac9702b8baa6006542baa556799a6f533] [formerly 18ed5733f7eefa46cc253d0a939e6dec1b200592 [formerly 6ad6978836484d9823d3db30258960e008c3b320]]] [formerly 16b30e87cee6c8f4c69afc6ed4ea373f309335f6 [formerly a0fd85730c9155b51b8d6cd1eeb011c485b5470a] [formerly 68840d8091d83d8bfffc8939d09c85e04eb9e7c0 [formerly d9ffbb59ce5938adb3f8a1bda71c9cc6d68a01e7]] [formerly 869cf586fef8a815d640b3292e29c3b21f55918b [formerly 41fbd9ebf8ba645cc9f824000bba319d3beffd49] [formerly 8b6d4eebc65566e57eb03f5bcda5e18b717a90d6 [formerly 3bb4cdc80001e35e3ba60e3631e8c2b920097a81]]]] [formerly a606000ef1b796e19386e4f4fe491a1a4d2848d0 [formerly 91c479070d59ae3bd1ae0c5740269837c5495596] [formerly c8c06c6299502734fff1e221a67a1981acf548fb [formerly 16a97cf4f776b6b9f679fe4199c4b38914bff7d5]] [formerly fda78b7ab6c23f7ccf2e4e7e21cafe4ccc634986 [formerly f31fa9fef3f82b68021e7941b6143e5aede6f4c7] [formerly af7e049df39029816f15d9d450ee792b85805ff4 [formerly 4ebfa287f29d5748fdd33f70636fd6b51c600722]]] [formerly 93d3c071bf13785df4c32d4ecd1ce883459f7c36 [formerly 5a517539d6a3ab259c0cd36594810648273f6845] [formerly 0accd294c62ef6445505a512640ea8475e78e322 [formerly 5a7387f441ff559464181f51375dc8a95accd163]] [formerly c8460ce2530638dfab2f9b43d2cf93f241636cd4 [formerly ae35c7bf1c21f71ea37c0d2a25b4ada43cf2a3ba] [formerly e55fd6c32c0852bb27a9011ef5e0fcd8bde6c8a4]]]] Former-commit-id: c3c53e6298cd3567226e62e9b4f8b4abb4eea1d5 [formerly 36956de8f67209d9b689ebc0aba0039a65c784ad] [formerly 37c8ddb3f3a6079a3a6279ac243388444efbbfa0 [formerly b72d7acb5aa5228f0be9832767e911293f5e9b3b]] [formerly 876395aae5e04caee299692041d7d88a5a0f25ab [formerly 05c51c75a67d47422573c6a15aa133a038bf1d56] [formerly 5bb7af3cc7b7d78d51382b0f21da2163323e896c [formerly 70d08d557c46ec8e19007c48122d309603cbcefd]]] [formerly d2d21ba7dd2173b89603543aeda29fc24bcc6c1f [formerly aabe5725d4034d81204cc08c5be1291b48c0fb3b] [formerly 6d6b524fb9175bc9d109dc9b6e0bc122e5794847 [formerly 697e303b9e7a3b69134b893d1079c73a06a62e2a]] [formerly 69967bd83ee954574d65c7a1c87332f79a93acba [formerly e81609ac6cdfe6c3a9de2460c94444a7706aa677] [formerly 62a738afef60830ac736c1719e28025f2ebab22d [formerly af1d7131e700fafb9787c9a02e39f9b9855b80fc]]]] Former-commit-id: b2541dbb59c6d6d64ad421a2999ebab67e409280 [formerly 0f191b41edafcd62efceebe900eff7ab6eac2b5f] [formerly d878d7611871799568966c609e0aedb5eb05e50b [formerly 0408cfe3e26273ab5422bc7cea2f14fb88e37c7e]] [formerly fd8ed39b415b0b72b691ee7b7c4913411a0c4a6e [formerly 2312838606f6e69dd356a5697b7f55afb144b892] [formerly b7491bb620e6eba50ce589ab43220c9e20eefbab [formerly fb44c28303b25a4316132be5f3b5a9ca6eca490d]]] Former-commit-id: ac321b2b8374e3d035011344a0b5df59b45e7ef7 [formerly 6ea1e3e1bbf748c3a61c06334a4809b3a523824c] [formerly 6147e94c591f58a978429e73fce9bb7bd46bd5e0 [formerly 57edb620eb7da422b9635f7ce6d756a39deb329c]] Former-commit-id: ee73a4d623a7f7cebccbe8abcdc5a44a33874bf5 [formerly 372f122b43c679a76bbbb9696b37561f705010f3] Former-commit-id: 70464b4dbee2ce44ff42cf54b20b40c3d8c0f814 --- tods/feature_analysis/BKFilter.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tods/feature_analysis/BKFilter.py b/tods/feature_analysis/BKFilter.py index c35d12c..bdb5ee5 100644 --- a/tods/feature_analysis/BKFilter.py +++ b/tods/feature_analysis/BKFilter.py @@ -186,22 +186,22 @@ class BKFilter(transformer.TransformerPrimitiveBase[Inputs, Outputs, Hyperparams if len(self._training_indices) > 0: # self._clf.fit(self._training_inputs) self._fitted = True - else: + else: # pragma: no cover if self.hyperparams['error_on_no_input']: raise RuntimeError("No input columns were selected") self.logger.warn("No input columns were selected") - if not self._fitted: + if not self._fitted: # pragma: no cover raise PrimitiveNotFittedError("Primitive not fitted.") sk_inputs = inputs - if self.hyperparams['use_semantic_types']: + if self.hyperparams['use_semantic_types']: # pragma: no cover sk_inputs = inputs.iloc[:, self._training_indices] output_columns = [] if len(self._training_indices) > 0: sk_output = self._bkfilter(sk_inputs, low=self.hyperparams['low'], high=self.hyperparams['high'], K=self.hyperparams['K']) - if sparse.issparse(sk_output): + if sparse.issparse(sk_output): # pragma: no cover sk_output = sk_output.toarray() outputs = self._wrap_predictions(inputs, sk_output) @@ -209,7 +209,7 @@ class BKFilter(transformer.TransformerPrimitiveBase[Inputs, Outputs, Hyperparams outputs.columns = self._input_column_names output_columns = [outputs] - else: + else: # pragma: no cover if self.hyperparams['error_on_no_input']: raise RuntimeError("No input columns were selected") self.logger.warn("No input columns were selected") @@ -217,14 +217,11 @@ class BKFilter(transformer.TransformerPrimitiveBase[Inputs, Outputs, Hyperparams add_index_columns=self.hyperparams['add_index_columns'], inputs=inputs, column_indices=self._training_indices, columns_list=output_columns) - - # self._write(outputs) - # self.logger.warning('produce was called3') return CallResult(outputs) @classmethod - def _get_columns_to_fit(cls, inputs: Inputs, hyperparams: Hyperparams): + def _get_columns_to_fit(cls, inputs: Inputs, hyperparams: Hyperparams): # pragma: no cover """ Select columns to fit. Args: @@ -261,7 +258,7 @@ class BKFilter(transformer.TransformerPrimitiveBase[Inputs, Outputs, Hyperparams # return columns_to_produce @classmethod - def _can_produce_column(cls, inputs_metadata: metadata_base.DataMetadata, column_index: int, hyperparams: Hyperparams) -> bool: + def _can_produce_column(cls, inputs_metadata: metadata_base.DataMetadata, column_index: int, hyperparams: Hyperparams) -> bool: # pragma: no cover """ Output whether a column can be processed. Args: @@ -354,8 +351,6 @@ class BKFilter(transformer.TransformerPrimitiveBase[Inputs, Outputs, Hyperparams return target_columns_metadata - def _write(self, inputs:Inputs): - inputs.to_csv(str(time.time())+'.csv') def _bkfilter(self, X, low, high, K): """