*** empty log message ***

svn path=/trunk/boinc/; revision=9366

checkin_notes

@@ -1209,10 +1209,16 @@ Charlie 31 Jan 2006
         boinc.xcodeproj/
             project.pbxproj
 
- Rom    31 Jan 2006
+Rom    31 Jan 2006
      - Bug Fix: If the wizard is configured for usernames, do not use the email
          address validator on the account info page.
          
      clientgui/
          AccountInfoPage.cpp
 
+David  31 Jan 2006
+    - Back out changes to LTD calculation
+
+    client/
+        client_types.C,h
+        cs_apps.C

client/client_types.C

@@ -421,13 +421,6 @@ bool PROJECT::potentially_runnable() {
     return false;
 }
 
-bool PROJECT::debt_adjust_allowed() {
-    if (non_cpu_intensive) return false;
-    if (suspended_via_gui) return false;
-    if (dont_request_more_work && !runnable()) return false;
-    return true;
-}
-
 double PROJECT::next_file_xfer_time(const bool is_upload) {
     return (is_upload ? next_file_xfer_up : next_file_xfer_down);
 }

client/client_types.h

@@ -255,8 +255,6 @@ public:
         // has a result in downloading state
     bool potentially_runnable();
         // runnable or contactable or downloading
-    bool debt_adjust_allowed();
-        // long term debt adjustment is allowed
 
     // temps used in CLIENT_STATE::rr_misses_deadline();
     std::vector<RESULT*>active;

client/cs_apps.C

@@ -413,7 +413,7 @@ double CLIENT_STATE::potentially_runnable_resource_share() {
     double x = 0;
     for (unsigned int i=0; i<projects.size(); i++) {
         PROJECT* p = projects[i];
-        if (p->debt_adjust_allowed()) {
+        if (p->potentially_runnable()) {
             x += p->resource_share;
         }
     }
@@ -471,7 +471,7 @@ void CLIENT_STATE::adjust_debts() {
 
         // adjust long-term debts
         //
-        if (p->debt_adjust_allowed()) {
+        if (p->potentially_runnable()) {
             nprojects++;
             share_frac = p->resource_share/prrs;
             p->long_term_debt += share_frac*total_wall_cpu_time_this_period
@@ -524,7 +524,7 @@ void CLIENT_STATE::adjust_debts() {
             p->anticipated_debt = p->short_term_debt;
             //msg_printf(p, MSG_INFO, "debt %f", p->short_term_debt);
         }
-        if (p->debt_adjust_allowed()) {
+        if (p->potentially_runnable()) {
             p->long_term_debt -= avg_long_term_debt;
         }
     }