Skip to content
This repository has been archived by the owner on Mar 1, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' into cuducos-test-core
Browse files Browse the repository at this point in the history
  • Loading branch information
cuducos committed May 23, 2017
2 parents bf0ebee + 9ad57ef commit 8d52981
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 23 deletions.
1 change: 0 additions & 1 deletion rosie.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ def run():
import rosie.chamber_of_deputies
import rosie.federal_senate


if len(argv) >= 3:
target_module = argv[2]
else:
Expand Down
2 changes: 1 addition & 1 deletion rosie/chamber_of_deputies/adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import numpy as np
import pandas as pd

from serenata_toolbox.chamber_of_deputies.chamber_of_deputies_dataset import ChamberOfDeputiesDataset
from serenata_toolbox.datasets import fetch


COLUMNS = {
'category': 'subquota_description',
'net_value': 'total_net_value',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import unicodedata

import numpy as np
from sklearn.base import TransformerMixin


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import unicodedata

import numpy as np
from sklearn.base import TransformerMixin

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from datetime import datetime

import numpy as np
import pandas as pd
from sklearn.base import TransformerMixin
Expand Down Expand Up @@ -56,7 +54,6 @@ def transform(self, X=None):
]
return self


def predict(self, X=None):
self._X['is_over_monthly_subquota_limit'] = False
for metadata in self.limits:
Expand All @@ -68,11 +65,9 @@ def predict(self, X=None):
results = self._X.loc[self.X.index, 'is_over_monthly_subquota_limit']
return np.r_[results]


def predict_proba(self, X=None):
return 1.


def __create_columns(self):
self._X['net_value_int'] = (self._X['net_value'] * 100).apply(int)

Expand All @@ -84,12 +79,10 @@ def __create_columns(self):
reimbursement_month['day'] = 1
self._X['reimbursement_month'] = pd.to_datetime(reimbursement_month)


def __find_surplus_reimbursements(self, data, monthly_limit):
grouped = data.groupby(self.KEYS).apply(self.__create_cumsum_cols)
return grouped[grouped['cumsum_net_value'] > monthly_limit]


def __create_cumsum_cols(self, subset):
subset['cumsum_net_value'] = subset['net_value_int'].cumsum()
return subset
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

import numpy as np
import pandas as pd
from geopy.distance import vincenty as distance
from sklearn.base import TransformerMixin
from sklearn.utils.validation import check_is_fitted

from geopy.distance import vincenty as distance


class TraveledSpeedsClassifier(TransformerMixin):
"""
Expand Down
3 changes: 1 addition & 2 deletions rosie/chamber_of_deputies/settings.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from rosie.chamber_of_deputies.classifiers.election_expenses_classifier import ElectionExpensesClassifier
from rosie.chamber_of_deputies.classifiers.irregular_companies_classifier import IrregularCompaniesClassifier
from rosie.chamber_of_deputies.classifiers.meal_price_outlier_classifier import MealPriceOutlierClassifier
from rosie.chamber_of_deputies.classifiers.monthly_subquota_limit_classifier import MonthlySubquotaLimitClassifier
from rosie.chamber_of_deputies.classifiers.traveled_speeds_classifier import TraveledSpeedsClassifier
from rosie.chamber_of_deputies.classifiers.irregular_companies_classifier import IrregularCompaniesClassifier
from rosie.core.classifiers.invalid_cnpj_cpf_classifier import InvalidCnpjCpfClassifier


CLASSIFIERS = {
'meal_price_outlier': MealPriceOutlierClassifier,
'over_monthly_subquota_limit': MonthlySubquotaLimitClassifier,
Expand Down
6 changes: 3 additions & 3 deletions rosie/chamber_of_deputies/tests/test_adapter.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import shutil
import os
import shutil
from shutil import copy2
from tempfile import mkdtemp
from unittest import TestCase
from unittest.mock import patch
from shutil import copy2

import pandas as pd

from rosie.chamber_of_deputies.adapter import Adapter as subject_class
from rosie.chamber_of_deputies.adapter import COLUMNS as ADAPTER_COLUMNS
from rosie.chamber_of_deputies.adapter import Adapter as subject_class


class TestAdapter(TestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import shutil
import os
import shutil
from pathlib import Path
from tempfile import mkdtemp
from unittest import TestCase
Expand Down
1 change: 1 addition & 0 deletions rosie/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import numpy as np
from sklearn.externals import joblib


class Core:
"""
This is Rosie's core object: it implements a generic pipeline to collect
Expand Down
2 changes: 0 additions & 2 deletions rosie/core/classifiers/invalid_cnpj_cpf_classifier.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import math

import numpy as np
from sklearn.base import TransformerMixin

Expand Down

0 comments on commit 8d52981

Please sign in to comment.