Re: [Powertop] [BUG] powertop shows estimates only for 1st battery from 2

On (10/11/13 11:22), Maksim Melnikau wrote:
> # powertop, Overview page, when first battery discharged
> The battery reports a discharge rate of 7.54 W
> The estimated remaining time is 5 hours, 28 minutes
> 
> So, from the beginning I'm expecting to see not 2.5h estimate, and
> later 5.5h. But smth like 8h from the beginning.

v2: after some thinking, better to fix parameters.


parameters: report correct "base power" parameter

Reported-by: Maksim Melnikau <maxposedon(a)gmail.com>
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky(a)gmail.com>

---

 src/parameters/parameters.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/parameters/parameters.cpp b/src/parameters/parameters.cpp
index 936d789..8ffda16 100644
--- a/src/parameters/parameters.cpp
+++ b/src/parameters/parameters.cpp
@@ -188,18 +188,14 @@ double compute_bundle(struct parameter_bundle *parameters, struct result_bundle
 	if (!bpi)
 		bpi = get_param_index("base power");
 
-	power = parameters->parameters[bpi];
-
-	for (i = 0; i < all_devices.size(); i++) {
-
+	for (i = 0; i < all_devices.size(); i++)
 		power += all_devices[i]->power_usage(results, parameters);
-	}
-//	printf("result power is %6.2f  guessed is %6.2f\n", results->power, power);
+
 	parameters->actual_power = results->power;
 	parameters->guessed_power = power;
 	/* scale the squared error by the actual power so that non-idle data points weigh heavier */
 	parameters->score += results->power * (power - results->power) * (power - results->power);
-
+	parameters->parameters[bpi] = power;
 	return power;
 }