Browse Source

fix BKFilter pull conflict

Former-commit-id: 3f0ddddb6d [formerly edb75f2b5a] [formerly d72390159b [formerly d87c1e2219]] [formerly 3ebf04a131 [formerly cf204bb9cf] [formerly 8cbbe4911f [formerly 1c7e4f2016]]] [formerly 72a6c31a72 [formerly 28d11e23e8] [formerly e70c674a31 [formerly bca9e9ef82]] [formerly f708bcbbf8 [formerly cd875157b6] [formerly ccf8f12765 [formerly 8e5d9a20fd]]]] [formerly e7864acd32 [formerly 4db14deb30] [formerly 2d0aaaade3 [formerly 532bf38bbf]] [formerly eea920e915 [formerly 538bd87326] [formerly a3d8a08bae [formerly e2e4dcbed4]]] [formerly 027397c00e [formerly fd8be3e371] [formerly f4929aff7a [formerly 6bc0c5e743]] [formerly 22c08349bb [formerly dca63ab4d7] [formerly 546f064d30 [formerly a15834dc62]]]]] [formerly 760aa21a45 [formerly 9be12db400] [formerly 62f7e06d88 [formerly b5d02b6624]] [formerly 46ee20cc9d [formerly eddaae82fe] [formerly 01891140a2 [formerly cc2289cce6]]] [formerly 1c24677034 [formerly fb7e7e4f15] [formerly 6b8565092c [formerly ea121ad5b8]] [formerly b9501f39fa [formerly 05ac31be51] [formerly 1bcc728902 [formerly 0f92578ce0]]]] [formerly e8e39cdc98 [formerly f0ca8bc0b3] [formerly d7d372efd5 [formerly 6b7a7d861a]] [formerly 34f41d2ebc [formerly 63d15c1836] [formerly 4e22463db1 [formerly 837bb738bf]]] [formerly fac046e27b [formerly 6d7d309511] [formerly c3565d8611 [formerly 748b61be64]] [formerly e986f036b9 [formerly b8fb642ecd] [formerly e55fd6c32c [formerly ffdd16e319]]]]]]
Former-commit-id: 7dfec19434 [formerly 8301a8933d] [formerly 4e42150d63 [formerly 1bf0e1c749]] [formerly c9ce7b2546 [formerly 67e5389ac9] [formerly 18ed5733f7 [formerly 6ad6978836]]] [formerly 16b30e87ce [formerly a0fd85730c] [formerly 68840d8091 [formerly d9ffbb59ce]] [formerly 869cf586fe [formerly 41fbd9ebf8] [formerly 8b6d4eebc6 [formerly 3bb4cdc800]]]] [formerly a606000ef1 [formerly 91c479070d] [formerly c8c06c6299 [formerly 16a97cf4f7]] [formerly fda78b7ab6 [formerly f31fa9fef3] [formerly af7e049df3 [formerly 4ebfa287f2]]] [formerly 93d3c071bf [formerly 5a517539d6] [formerly 0accd294c6 [formerly 5a7387f441]] [formerly c8460ce253 [formerly ae35c7bf1c] [formerly e55fd6c32c]]]]
Former-commit-id: c3c53e6298 [formerly 36956de8f6] [formerly 37c8ddb3f3 [formerly b72d7acb5a]] [formerly 876395aae5 [formerly 05c51c75a6] [formerly 5bb7af3cc7 [formerly 70d08d557c]]] [formerly d2d21ba7dd [formerly aabe5725d4] [formerly 6d6b524fb9 [formerly 697e303b9e]] [formerly 69967bd83e [formerly e81609ac6c] [formerly 62a738afef [formerly af1d7131e7]]]]
Former-commit-id: b2541dbb59 [formerly 0f191b41ed] [formerly d878d76118 [formerly 0408cfe3e2]] [formerly fd8ed39b41 [formerly 2312838606] [formerly b7491bb620 [formerly fb44c28303]]]
Former-commit-id: ac321b2b83 [formerly 6ea1e3e1bb] [formerly 6147e94c59 [formerly 57edb620eb]]
Former-commit-id: ee73a4d623 [formerly 372f122b43]
Former-commit-id: 70464b4dbe
master
YileAllenChen1 4 years ago
parent
commit
62288bff93
1 changed files with 7 additions and 12 deletions
  1. +7
    -12
      tods/feature_analysis/BKFilter.py

+ 7
- 12
tods/feature_analysis/BKFilter.py View File

@@ -186,22 +186,22 @@ class BKFilter(transformer.TransformerPrimitiveBase[Inputs, Outputs, Hyperparams
if len(self._training_indices) > 0: if len(self._training_indices) > 0:
# self._clf.fit(self._training_inputs) # self._clf.fit(self._training_inputs)
self._fitted = True self._fitted = True
else:
else: # pragma: no cover
if self.hyperparams['error_on_no_input']: if self.hyperparams['error_on_no_input']:
raise RuntimeError("No input columns were selected") raise RuntimeError("No input columns were selected")
self.logger.warn("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.") raise PrimitiveNotFittedError("Primitive not fitted.")
sk_inputs = inputs 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] sk_inputs = inputs.iloc[:, self._training_indices]
output_columns = [] output_columns = []
if len(self._training_indices) > 0: if len(self._training_indices) > 0:
sk_output = self._bkfilter(sk_inputs, low=self.hyperparams['low'], high=self.hyperparams['high'], K=self.hyperparams['K']) 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() sk_output = sk_output.toarray()
outputs = self._wrap_predictions(inputs, sk_output) outputs = self._wrap_predictions(inputs, sk_output)


@@ -209,7 +209,7 @@ class BKFilter(transformer.TransformerPrimitiveBase[Inputs, Outputs, Hyperparams
outputs.columns = self._input_column_names outputs.columns = self._input_column_names
output_columns = [outputs] output_columns = [outputs]
else:
else: # pragma: no cover
if self.hyperparams['error_on_no_input']: if self.hyperparams['error_on_no_input']:
raise RuntimeError("No input columns were selected") raise RuntimeError("No input columns were selected")
self.logger.warn("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'], add_index_columns=self.hyperparams['add_index_columns'],
inputs=inputs, column_indices=self._training_indices, inputs=inputs, column_indices=self._training_indices,
columns_list=output_columns) columns_list=output_columns)

# self._write(outputs)
# self.logger.warning('produce was called3')
return CallResult(outputs) return CallResult(outputs)
@classmethod @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. Select columns to fit.
Args: Args:
@@ -261,7 +258,7 @@ class BKFilter(transformer.TransformerPrimitiveBase[Inputs, Outputs, Hyperparams
# return columns_to_produce # return columns_to_produce


@classmethod @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. Output whether a column can be processed.
Args: Args:
@@ -354,8 +351,6 @@ class BKFilter(transformer.TransformerPrimitiveBase[Inputs, Outputs, Hyperparams


return target_columns_metadata return target_columns_metadata


def _write(self, inputs:Inputs):
inputs.to_csv(str(time.time())+'.csv')


def _bkfilter(self, X, low, high, K): def _bkfilter(self, X, low, high, K):
""" """


Loading…
Cancel
Save