Rename amount_recharged into amount_recharges

cynddl · cynddl · commit 8c923db1fff1 · 2016-04-27T14:35:19.000+02:00
diff --git a/bandicoot/recharge.py b/bandicoot/recharge.py
@@ -28,7 +28,7 @@
 
 
 @recharges_grouping
-def amount_recharged(recharges):
+def amount_recharges(recharges):
     """
     Returns the distribution of amount recharged on the mobile phone.
     """
diff --git a/bandicoot/tests/samples/manual/A.json b/bandicoot/tests/samples/manual/A.json
@@ -27,7 +27,7 @@
 	"percent_pareto_durations": {"allweek": {"allday": {"call": 1.0}}},
 	"frequent_antennas": {"allweek": {"allday": 2.0}},
 
-	"amount_recharged": {"allweek": {"allday": {"mean": 4.4}}},
+	"amount_recharges": {"allweek": {"allday": {"mean": 4.4}}},
 	"percent_pareto_recharges": {"allweek": {"allday": 0.6}},
 	"number_of_recharges": {"allweek": {"allday": 5}}
 }
diff --git a/bandicoot/tests/samples/regressions/ego.json b/bandicoot/tests/samples/regressions/ego.json
@@ -5,7 +5,7 @@
         "reporting__attributes_path": "samples/attributes",
         "reporting__recharges_path": "samples/attributes",
         "reporting__version": "0.4.0",
-        "reporting__code_signature": "e56f6c4a25443e4d7b70f568faf87f28603af9e2",
+        "reporting__code_signature": "7b35bec9ffc41ee3013a66f98a7032bcf605734f",
         "reporting__groupby": "week",
         "reporting__split_week": true,
         "reporting__split_day": true,
diff --git a/bandicoot/tests/samples/regressions/empty_user.json b/bandicoot/tests/samples/regressions/empty_user.json
@@ -5,7 +5,7 @@
         "reporting__attributes_path": null,
         "reporting__recharges_path": null,
         "reporting__version": "0.4.0",
-        "reporting__code_signature": "e56f6c4a25443e4d7b70f568faf87f28603af9e2",
+        "reporting__code_signature": "7b35bec9ffc41ee3013a66f98a7032bcf605734f",
         "reporting__groupby": "week",
         "reporting__split_week": true,
         "reporting__split_day": true,
diff --git a/bandicoot/tests/samples/regressions/manual_a.json b/bandicoot/tests/samples/regressions/manual_a.json
diff --git a/bandicoot/tests/samples/regressions/manual_a_orange_network.json b/bandicoot/tests/samples/regressions/manual_a_orange_network.json
@@ -5,7 +5,7 @@
         "reporting__attributes_path": "samples/attributes",
         "reporting__recharges_path": "samples/attributes",
         "reporting__version": "0.4.0",
-        "reporting__code_signature": "e56f6c4a25443e4d7b70f568faf87f28603af9e2",
+        "reporting__code_signature": "7b35bec9ffc41ee3013a66f98a7032bcf605734f",
         "reporting__groupby": "week",
         "reporting__split_week": true,
         "reporting__split_day": true,
diff --git a/bandicoot/tests/samples/regressions/sample_user.json b/bandicoot/tests/samples/regressions/sample_user.json
@@ -5,7 +5,7 @@
         "reporting__attributes_path": null,
         "reporting__recharges_path": null,
         "reporting__version": "0.4.0",
-        "reporting__code_signature": "e56f6c4a25443e4d7b70f568faf87f28603af9e2",
+        "reporting__code_signature": "7b35bec9ffc41ee3013a66f98a7032bcf605734f",
         "reporting__groupby": null,
         "reporting__split_week": true,
         "reporting__split_day": true,
diff --git a/bandicoot/utils.py b/bandicoot/utils.py
@@ -152,7 +152,7 @@ def all(user, groupby='week', summary='default', network=False,
 
     if user.has_recharges:
         functions += [
-            (bc.recharge.amount_recharged, summary_type),
+            (bc.recharge.amount_recharges, summary_type),
             (bc.recharge.interevent_time_recharges, summary_type),
             (bc.recharge.percent_pareto_recharges, scalar_type),
             (bc.recharge.number_of_recharges, scalar_type),

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`"percent_pareto_durations": {"allweek": {"allday": {"call": 1.0}}},`
`28`	`28`	`"frequent_antennas": {"allweek": {"allday": 2.0}},`
`29`	`29`
`30`		`- "amount_recharged": {"allweek": {"allday": {"mean": 4.4}}},`
	`30`	`+ "amount_recharges": {"allweek": {"allday": {"mean": 4.4}}},`
`31`	`31`	`"percent_pareto_recharges": {"allweek": {"allday": 0.6}},`
`32`	`32`	`"number_of_recharges": {"allweek": {"allday": 5}}`
`33`	`33`	`}`