Added Averaqe Daily Load stats on deck front page

res/layout-xlarge/studyoptions.xml

@@ -108,6 +108,20 @@
 							android:textColor="#007700" />
 					</LinearLayout>
 				</TableRow>
+				<TableRow>
+					<TextView 
+						android:layout_height="wrap_content"
+						android:textColor="#000000"
+						android:layout_width="wrap_content"
+						android:text="studyoptions_avgdailyload"
+						android:paddingRight="5dip"/>
+					<TextView 
+						android:id="@+id/studyoptions_forecast"
+						android:layout_height="wrap_content"
+						android:textColor="#000000"
+						android:layout_width="wrap_content"
+						android:gravity="right"/>
+				</TableRow>
 				<TableRow>
 					<TextView 
 						android:layout_height="wrap_content"

res/layout/studyoptions.xml

@@ -111,6 +111,20 @@
 					android:textColor="#007700" />
 			</LinearLayout>
    			</TableRow>
+			<TableRow>
+				<TextView 
+					android:layout_height="wrap_content"
+					android:textColor="#000000"
+					android:layout_width="wrap_content"
+					android:text="@string/studyoptions_avgdailyload"
+					android:paddingRight="5dip"/>
+				<TextView 
+					android:id="@+id/studyoptions_forecast"
+					android:layout_height="wrap_content"
+					android:textColor="#000000"
+					android:layout_width="wrap_content"
+					android:gravity="right"/>
+			</TableRow>
 			<TableRow>
 				<TextView 
 					android:layout_height="wrap_content"

res/values-ar/01-core.xml

@@ -28,6 +28,7 @@
   <string name="ok">موافق</string>
   <string name="studyoptions_deck_name">اسم مجموعة البطاقات</string>
   <string name="studyoptions_due_today">المستحق اليوم:</string>
+  <string name="studyoptions_avgdailyload">Daily load:</string>
   <string name="studyoptions_new_total">مجموع البطاقات الجديدة:</string>
   <string name="studyoptions_total_cards">مجموع البطاقات:</string>
   <string name="studyoptions_eta">الوقت المقدر (دقيقة):</string>

res/values-fr/01-core.xml

@@ -28,6 +28,7 @@
   <string name="ok">OK</string>
   <string name="studyoptions_deck_name">Nom du paquet</string>
   <string name="studyoptions_due_today">Prévues aujourd’hui :</string>
+  <string name="studyoptions_avgdailyload">Charge journalière :</string>
   <string name="studyoptions_new_total">Cartes inédites :</string>
   <string name="studyoptions_total_cards">Cartes :</string>
   <string name="studyoptions_eta">Durée estimée (mn) :</string>

res/values/01-core.xml

@@ -32,6 +32,7 @@
 <!--<string name="studyoptions_title">Study Options</string>
 --><string name="studyoptions_deck_name">Deck name</string>
 <string name="studyoptions_due_today">Due today:</string>
+<string name="studyoptions_avgdailyload">Daily load:</string>
 <string name="studyoptions_new_total">Total new cards:</string>
 <string name="studyoptions_total_cards">Total cards:</string>
 <string name="studyoptions_eta">Estimated time (min):</string>
@@ -102,8 +103,7 @@
 <!-- <string name="menu_deck_properties">Deck Properties</string> -->
 <string name="menu_about">About</string>
 
-<string name="menu_dismiss_note">Dismiss Note...</string>
-<string name="menu_bury_note">Bury Note</string>
+<string name="menu_dismiss_note">Dismiss Note...</string><string name="menu_bury_note">Bury Note</string>
 <string name="menu_suspend_card">Suspend Card</string>
 <string name="menu_suspend_note">Suspend Note</string>
 <string name="menu_delete_note">Delete Note</string>
@@ -180,4 +180,5 @@
 <string name="help_cloze">help</string>
 
 <string name="button_sync">Sync</string>
+
 </resources>

src/com/ichi2/anki/StudyOptionsFragment.java

@@ -142,6 +142,7 @@ public class StudyOptionsFragment extends Fragment {
     private TextView mTextTotal;
     private TextView mTextETA;
     private LinearLayout mSmallChart;
+    private TextView mTextAvgDailyLoad;
     private LinearLayout mDeckCounts;
     private LinearLayout mDeckChart;
     private ImageButton mAddNote;
@@ -443,6 +444,7 @@ public void onConfigurationChanged(Configuration newConfig) {
         CharSequence lrnToday = mTextTodayLrn.getText();
         CharSequence revToday = mTextTodayRev.getText();
         CharSequence newTotal = mTextNewTotal.getText();
+        CharSequence avgDailyLoad = mTextAvgDailyLoad.getText();
         CharSequence total = mTextTotal.getText();
         CharSequence eta = mTextETA.getText();
 //        long timelimit = mCol.getTimeLimit() / 60;
@@ -460,6 +462,7 @@ public void onConfigurationChanged(Configuration newConfig) {
         mTextTodayNew.setText(newToday);
         mTextTodayLrn.setText(lrnToday);
         mTextTodayRev.setText(revToday);
+        mTextAvgDailyLoad.setText(avgDailyLoad);
         mTextNewTotal.setText(newTotal);
         mTextTotal.setText(total);
         mTextETA.setText(eta);
@@ -644,6 +647,7 @@ private void initAllContentViews(LayoutInflater inflater) {
         mTextTotal = (TextView) mStudyOptionsView.findViewById(R.id.studyoptions_total);
         mTextETA = (TextView) mStudyOptionsView.findViewById(R.id.studyoptions_eta);
         mSmallChart = (LinearLayout) mStudyOptionsView.findViewById(R.id.studyoptions_mall_chart);
+        mTextAvgDailyLoad = (TextView) mStudyOptionsView.findViewById(R.id.studyoptions_forecast);
 
         mGlobalMatBar.setVisibility(View.INVISIBLE);
         mGlobalBar.setVisibility(View.INVISIBLE);
@@ -1231,6 +1235,7 @@ public void onPostExecute(DeckTask.TaskData result) {
                 mProgressAll = (Double) obj[6];
                 int eta = (Integer) obj[7];
                 double[][] serieslist = (double[][]) obj[8];
+                double forecast = (Double) obj[9];
 
                 updateStatisticBars();
                 updateChart(serieslist);
@@ -1264,6 +1269,7 @@ public void onPostExecute(DeckTask.TaskData result) {
                 } else {
                     mTextETA.setText("-");
                 }
+               mTextAvgDailyLoad.setText(String.valueOf(forecast));
 
                 if (mDeckCounts.getVisibility() == View.INVISIBLE) {
                     mDeckCounts.setVisibility(View.VISIBLE);

src/com/ichi2/async/DeckTask.java

@@ -736,14 +736,15 @@ private TaskData doInBackgroundUpdateValuesFromDeck(TaskData... params) {
 			int totalCount = sched.cardCount();
 			double progressMature = ((double) sched.matureCount()) / ((double) totalCount);
 			double progressAll = 1 - (((double) (totalNewCount + counts[1])) / ((double) totalCount));
-			double[][] serieslist = null;
+			double[][] serieslist = null;			
 			// only calculate stats if necessary
 			if ((Boolean) obj[1]) {
 				serieslist = Stats.getSmallDueStats(sched.getCol());
 			}
+			double forecast = sched.avgDailyLoad();
 			return new TaskData(new Object[] { counts[0], counts[1], counts[2],
 					totalNewCount, totalCount, progressMature, progressAll,
-					sched.eta(counts), serieslist });			
+					sched.eta(counts), serieslist, forecast });			
 		} catch (RuntimeException e) {
 			Log.e(AnkiDroidApp.TAG, "doInBackgroundUpdateValuesFromDeck - an error occurred: " + e);
 			return null;

src/com/ichi2/libanki/Sched.java

@@ -2811,4 +2811,29 @@ public int compare(long[] lhs, long[] rhs) {
         }
     }
 
+    /**
+     * Compute the average cards per day, which is the sum on the inverse of the frequency of the cards.
+     * For ex: a card with freq=4 day will worth 0.25 card/day
+     * @return average cards per day
+     */
+	public double avgDailyLoad() {
+        Cursor cur = null;
+        try {
+            cur = mCol
+                    .getDb()
+                    .getDatabase()
+                    .rawQuery(
+                            "select round(sum(1./ivl),2) from cards where did IN "
+                    		+ Utils.ids2str(mCol.getDecks().active()) + " and ivl>0 and queue!=-1", null);
+            if (!cur.moveToFirst()) {
+                return -1;
+            }
+            return cur.getDouble(0);
+        } finally {
+            if (cur != null && !cur.isClosed()) {
+                cur.close();
+            }
+        }
+	}
+
 }