sithuWiki commited on
Commit
ae87734
·
verified ·
1 Parent(s): d6163b9

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +13 -10
app.py CHANGED
@@ -82,26 +82,27 @@ def predict_roi(machine_price, machine_hashrate, machine_power, machine_efficien
82
 
83
 
84
  # ---------------------------------------------------------
85
- # Bucket electricity rate and choose scaler + canonical rate
 
 
86
  # ---------------------------------------------------------
87
  if user_electricity_rate < 0.05:
88
  scaler_region = "ethiopia"
89
- canonical_elec = 0.01
90
  region_bucket = "Low-cost (< $0.05/kWh)"
91
- elif user_electricity_rate < 0.10:
92
  scaler_region = "china"
93
- canonical_elec = 0.08
94
- region_bucket = "Medium-cost ($0.05–$0.10/kWh)"
95
  else:
96
  scaler_region = "texas"
97
- canonical_elec = 0.15
98
- region_bucket = "High-cost (> $0.10/kWh)"
99
 
100
- # Override region used in the pipeline with the bucketed one
101
  region = scaler_region
102
 
103
  # This is the value that will be used for all 30 days in the window
104
- electricity_rate_used = canonical_elec
 
 
105
 
106
 
107
  print("User machine specs:")
@@ -111,7 +112,9 @@ def predict_roi(machine_price, machine_hashrate, machine_power, machine_efficien
111
  print(f" Efficiency: {machine_efficiency}")
112
  print(f" User elec rate: {user_electricity_rate} USD/kWh")
113
  print(f" Bucket region: {region}")
114
- print(f" Canonical elec: {electricity_rate_used} USD/kWh")
 
 
115
 
116
  # # -------- choose scaler region from electricity_rate --------
117
  # if electricity_rate < 0.05:
 
82
 
83
 
84
  # ---------------------------------------------------------
85
+ # Bucket electricity rate ONLY to choose scaler
86
+ # The actual feature value will be the user input, repeated
87
+ # for all 30 days in the window.
88
  # ---------------------------------------------------------
89
  if user_electricity_rate < 0.05:
90
  scaler_region = "ethiopia"
 
91
  region_bucket = "Low-cost (< $0.05/kWh)"
92
+ elif user_electricity_rate < 1.0:
93
  scaler_region = "china"
94
+ region_bucket = "Medium-cost ($0.05–$1.00/kWh)"
 
95
  else:
96
  scaler_region = "texas"
97
+ region_bucket = "High-cost (≥ $1.00/kWh)"
 
98
 
99
+ # Region for the pipeline (used by get_latest_sequence & predictor)
100
  region = scaler_region
101
 
102
  # This is the value that will be used for all 30 days in the window
103
+ # (prepare_miner_features repeats it across time).
104
+ electricity_rate_used = user_electricity_rate
105
+
106
 
107
 
108
  print("User machine specs:")
 
112
  print(f" Efficiency: {machine_efficiency}")
113
  print(f" User elec rate: {user_electricity_rate} USD/kWh")
114
  print(f" Bucket region: {region}")
115
+ print(f" Elec used in features (all 30 days): {electricity_rate_used} USD/kWh")
116
+ print("=" * 80 + "\n")
117
+
118
 
119
  # # -------- choose scaler region from electricity_rate --------
120
  # if electricity_rate < 0.05: