From 505a135ac83d28d48d966e4f92f5cd3cf69611f1 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Wed, 16 Nov 2016 14:43:01 +0100
Subject: [PATCH] CPP add sum to basal rate representation

---
 .../CircadianPercentageProfileFragment.java   |  5 +++-
 .../CircadianPercentageProfilePlugin.java     | 27 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java
index 0d518c0603..c8a23ccdff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java
@@ -242,6 +242,9 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
         sb.append("</h3>");
         sb.append("<h4>");
         sb.append(getString(R.string.nsprofileview_basal_label));
+        sb.append( " ( ∑");
+        sb.append(DecimalFormatter.to2Decimal(circadianPercentageProfilePlugin.percentageBasalSum()));
+        sb.append("U )");
         sb.append("</h4> " + circadianPercentageProfilePlugin.basalString());
         sb.append("<h4>");
         sb.append(getString(R.string.nsprofileview_ic_label));
@@ -251,7 +254,7 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
         sb.append("</h4> " + circadianPercentageProfilePlugin.isfString());
         profileView.setText(Html.fromHtml(sb.toString()));
 
-        baseprofileBasal.setText(Html.fromHtml("<h3>" + getString(R.string.base_profile_label) + "</h3>" +
+        baseprofileBasal.setText(Html.fromHtml("<h3>" + getString(R.string.base_profile_label) + " ( ∑" + DecimalFormatter.to2Decimal(circadianPercentageProfilePlugin.baseBasalSum()) + "U )</h3>" +
                 "<h4>" + getString(R.string.nsprofileview_basal_label) + "</h4>" + circadianPercentageProfilePlugin.baseBasalString()));
         baseprofileIC.setText(Html.fromHtml("<h4>" + getString(R.string.nsprofileview_ic_label) + "</h4>" + circadianPercentageProfilePlugin.baseIcString()));
         baseprofileISF.setText(Html.fromHtml("<h4>" + getString(R.string.nsprofileview_isf_label) + "</h4>" + circadianPercentageProfilePlugin.baseIsfString()));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java
index 2caa7c0639..094ae157c8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java
@@ -207,11 +207,7 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
         JSONObject profile = new JSONObject();
 
         StringBuilder stringBuilder = new StringBuilder();
-        double sum = 0d;
-        for (int i = 0; i < 24; i++) {
-            sum += basebasal[i];
-        }
-        stringBuilder.append(DecimalFormatter.to2Decimal(sum));
+        stringBuilder.append(DecimalFormatter.to2Decimal(sum(basebasal)));
         stringBuilder.append("U@");
         stringBuilder.append(percentage);
         stringBuilder.append("%>");
@@ -298,6 +294,27 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
 
     String baseBasalString() {return profileString(basebasal, 0, 100, true);}
 
+    public double baseBasalSum(){
+        return sum(basebasal);
+    }
+
+    public double percentageBasalSum(){
+        double result = 0;
+        for (int i = 0; i < basebasal.length; i++) {
+            result += SafeParse.stringToDouble(DecimalFormatter.to2Decimal(basebasal[i] * percentage / 100d));
+        }
+        return result;
+    }
+
+
+    public static double sum(double values[]){
+        double result = 0;
+        for (int i = 0; i < values.length; i++) {
+            result += values[i];
+        }
+        return result;
+    }
+
 
     private static String profileString(double[] values, int timeshift, int percentage, boolean inc) {
         timeshift = -(timeshift % 24) + 24;