Commit 489f7495 authored by Brewer, Wes's avatar Brewer, Wes
Browse files

Merge branch 'set-min-time' into 'main' 

Set min_time

See merge request !53
parents 40e3d8f5 ad6da7bb

raps/dataloaders/frontier.py

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ def load_data_from_df(jobs_df: pd.DataFrame, jobprofile_df: pd.DataFrame, **kwar 
    validate = kwargs.get('validate')

    jid = kwargs.get('jid', '*')



    #min_time = kwargs.get('min_time', None)

    min_time = None

    min_time = kwargs.get('min_time', None)



    # Sort jobs dataframe based on values in time_start column, adjust indices after sorting

    jobs_df = jobs_df[jobs_df['time_start'].notna()]

raps/dataloaders/marconi100.py

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ def load_data_from_df(jobs_df: pd.DataFrame, **kwargs): 
    list

        The list of parsed jobs.

    """

    min_time = None

    min_time = kwargs.get('min_time', None)

    reschedule = kwargs.get('reschedule')

    validate = kwargs.get('validate')

    jid = kwargs.get('jid', '*')