Commit 8de8d37e authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

PrrtReturnPackage is now a timestamp. Durations are calculated based on _T.

parent f1da11b4

xlap.yml

+3 −6
Original line number Diff line number Diff line 
data_files:

    sender: "rtn2017/results/on/2017_03_28_09_33_00_Sender.csv"

    receiver: "rtn2017/results/on/2017_03_28_09_33_00_Receiver.csv"

    sender: "sender.csv"

    receiver: "receiver.csv"

cycle_reference:

    sender:

        Start: PrrtSendStart
@@ -34,9 +34,6 @@ stamps: 
    PrrtTransmitStart:

        Source: sender

        Type: cycle

    PrrtTransmitStart:

        Source: sender

        Type: cycle

    PrrtTransmitEnd:

        Source: sender

        Type: cycle
@@ -79,7 +76,7 @@ stamps: 
        Type: cycle

    PrrtReturnPackage:

        Source: receiver

        Type: cycle

        Type: time

    PrrtReceivePackage:

        Source: receiver

        Type: time

xlap/parse.py

+1 −3
Original line number Diff line number Diff line
@@ -72,9 +72,7 @@ def evaluate(sender_file, receiver_file, config, kind=0): 


    # Generate Durations

    for name, duration in config["durations"].items():

        diff = df[duration["Stop"] + "_C"] - df[duration["Start"] + "_C"]

        df[name + "_C"] = diff

        df[name + "_D"] = diff * df[duration["Source"].capitalize() + "Cycle_D"]

        df[name + "_D"] = df[duration["Stop"] + "_T"] - df[duration["Start"] + "_T"]



    df["EndToEnd_D"] = df["Sender_D"] + df["Receiver_D"]