From 983149a4e42da16689ca1f82d886e2eb427948f3 Mon Sep 17 00:00:00 2001
From: James Cherry <cherry@parallaxsw.com>
Date: Mon, 2 Nov 2020 12:39:36 -0800
Subject: [PATCH] Power::findInputDuty reorder */

---
 search/Power.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/search/Power.cc b/search/Power.cc
index 3e274280..0addd1bd 100644
--- a/search/Power.cc
+++ b/search/Power.cc
@@ -846,13 +846,13 @@ Power::findInputDuty(const Pin *to_pin,
       FuncExpr *when = pwr->when();
       Vertex *from_vertex = graph_->pinLoadVertex(from_pin);
       if (func && func->hasPort(from_port)) {
-	PwrActivity from_activity = findActivity(from_pin);
-	PwrActivity to_activity = findActivity(to_pin);
+	float from_activity = findActivity(from_pin).activity();
+	float to_activity = findActivity(to_pin).activity();
 	float duty1 = evalActivityDifference(func, inst, from_port).duty();
-	if (to_activity.activity() == 0.0)
+	if (to_activity == 0.0)
 	  return 0.0;
 	else
-	  return from_activity.activity() / to_activity.activity() * duty1;
+	  return from_activity * duty1 / to_activity;
       }
       else if (when)
 	return evalActivity(when, inst).duty();