Skip to content

Commit

Permalink
Modified runtime output to look nicer in HC
Browse files Browse the repository at this point in the history
  • Loading branch information
jenny-nyx committed Mar 14, 2024
1 parent 8928ed6 commit 1ecd654
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
4 changes: 2 additions & 2 deletions omf/models/hostingCapacity.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<style>td, th {padding:7 0 5 20;text-align: left;font-size:0.8em; border: 1px solid #cccccc;} </style>
<div id="output">
{% if allInputDataDict['runAmiAlgorithm'] == 'on' %}
<p class="reportTitle">AMI-Based Hosting Capacity Runtime </p>
<p class="reportTitle">AMI-Based Hosting Capacity Runtime ( H:M:S:MS ) </p>
<div id="AMI_runtime" class="tightContent">
<span style="border: 1px solid grey; padding: 3px;"> {{ allOutputDataDict['AMI_runtime']}} </span>
</div>
Expand Down Expand Up @@ -138,7 +138,7 @@
</div>
{% endif %}
{% if allInputDataDict['optionalCircuitFile'] == 'on' %}
<p class="reportTitle">Traditional/Model-Based Hosting Capacity Runtime</p>
<p class="reportTitle">Traditional/Model-Based Hosting Capacity Runtime ( H:M:S:MS )</p>
<div id="traditionalRunTime" class="tightContent">
<span style="border: 1px solid grey; padding: 3px;"> {{ allOutputDataDict['traditionalRuntime'] }} </span>
</div>
Expand Down
15 changes: 12 additions & 3 deletions omf/models/hostingCapacity.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@
modelName, template = __neoMetaModel__.metadata(__file__)
hidden = False

def convert_seconds_to_hms_ms( seconds ):
milliseconds = seconds * 1000

# Calculate hours, minutes, seconds, and milliseconds
hours, remainder = divmod(milliseconds, 3600000)
minutes, remainder = divmod(remainder, 60000)
seconds, milliseconds = divmod(remainder, 1000)

return "{:02d}:{:02d}:{:02d}.{:03d}".format(int(hours), int(minutes), int(seconds), int(milliseconds))

def bar_chart_coloring( row ):
color = 'black'
if row['thermal_violation'] and not row['voltage_violation']:
Expand Down Expand Up @@ -81,7 +91,7 @@ def run_ami_algorithm(modelDir, inputDict, outData):
outData['barChartFigure'] = json.dumps( barChartFigure, cls=py.utils.PlotlyJSONEncoder )
outData['AMI_tableHeadings'] = AMI_results.columns.values.tolist()
outData['AMI_tableValues'] = ( list(AMI_results.sort_values( by="max_cap_allowed_kW", ascending=False, ignore_index=True ).itertuples(index=False, name=None)) )
outData['AMI_runtime'] = AMI_end_time - AMI_start_time
outData['AMI_runtime'] = convert_seconds_to_hms_ms( AMI_end_time - AMI_start_time )


def run_traditional_algorithm(modelDir, inputDict, outData):
Expand Down Expand Up @@ -135,10 +145,9 @@ def run_traditional_algorithm(modelDir, inputDict, outData):
outData['traditionalGraphData'] = json.dumps(traditionalHCFigure, cls=py.utils.PlotlyJSONEncoder )
outData['traditionalHCTableHeadings'] = tradHCDF.columns.values.tolist()
outData['traditionalHCTableValues'] = (list(tradHCDF.itertuples(index=False, name=None)))
outData['traditionalRuntime'] = traditional_end_time - traditional_start_time
outData['traditionalRuntime'] = convert_seconds_to_hms_ms( traditional_end_time - traditional_start_time )
outData['traditionalHCResults'] = traditionalHCResults


def runtimeEstimate(modelDir):
''' Estimated runtime of model in minutes. '''
return 1.0
Expand Down
4 changes: 3 additions & 1 deletion omf/scratch/transformerPairing/selenium_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,19 @@ def chrome_test( url, username, password ):
password_field = driver.find_element(by=By.ID, value='password')
username_field.send_keys(username)
password_field.send_keys(password)

time.sleep(2)
password_field.send_keys(Keys.RETURN)

# Create transformerPairing Model
driver.find_element(by=By.ID, value="newModelButton").click()
time.sleep(2)

## find transformerPairing Model using xpath
#transformerPairingModelButton = driver.find_element(by=By.XPATH, value="//a[contains(@href, 'transformerPairing')]" )
# transformerPairingModelButton.click()
#driver.execute_script("arguments[0].click();", transformerPairingModelButton)
driver.find_element(by=By.XPATH, value="//a[contains(@href, 'transformerPairing')]" ).click()
time.sleep(2)

wait = WebDriverWait(driver, 2)
alert = wait.until(expected_conditions.alert_is_present())
Expand Down

0 comments on commit 1ecd654

Please sign in to comment.