correct roi formula and data as of 16 may 2024

data/all_trades_profitability.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:614121130ee6e8b7e52febcec2cd07a6006c5c7ec3f328f22eb205395a690d46
-size 33106105
+oid sha256:ea9047bacb53f4f2d396242ae39939517fde4b4061f425c992e981cc92c5b452
+size 34257800

data/fpmmTrades.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8de4bc60319146b9e950a767a465153ab4d2f3aa9dd03f37fb260ff7423d7e2f
-size 72718297
+oid sha256:6a297b050b6c7c88c8fe7d0c597f362b95c0af735f65ff3218e9c748bdcbb820
+size 76092671

data/fpmms.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58d686969f97ff62bd734f1d5b163d5a8c676650d112958fe5f2793960e7edee
-size 434623
+oid sha256:c313ba383cbff6ed1bdacadade252d9e5ae8b66359336c99b3ad7845842e533d
+size 448312

data/requests.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:378419c0b6133eade10f3b20587db5099571274b2742ce3d90d8b897dd764995
-size 156914184
+oid sha256:861e85f3437c0c75001e8b10731b91c643f0e0ef0bab214257c26d2a25fa9628
+size 168361105

data/summary_profitability.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dcefbdfc4091a2668f7027e519260053e45df29b0a86bd57f25ec2c8cfcc59a3
-size 63096
+oid sha256:60f49e3d95e3abc0d93b7518e3287f9fbbe65211b3447ed21030ab4b5415c7a9
+size 65116

data/t_map.pkl

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71cae4e569918e734378eeb936558cc96a119a4096995c8fec3b419bd9a1516c
-size 7078203
+oid sha256:c1a007c0c28c3ab7cd85597a9cedde455c346b481adec25c6ab0223f50808c9c
+size 7422234

scripts/profitability.py

@@ -532,7 +532,7 @@ def analyse_trader(
                 "num_mech_calls": num_mech_calls,
                 "mech_fee_amount": num_mech_calls * DEFAULT_MECH_FEE,
                 "net_earnings": net_earnings,
-                "roi": net_earnings / collateral_amount,
+                "roi": net_earnings / (collateral_amount + fee_amount + num_mech_calls * DEFAULT_MECH_FEE),
             }
 
         except Exception as e:

test.py

@@ -1,92 +0,0 @@
-import gradio as gr
-import pandas as pd
-
-
-demo = gr.Blocks()
-
-data1 = pd.DataFrame({
-    "tool": ["tool1", "tool2", "tool3"],
-    "error": [0.1, 0.2, 0.3]
-})
-
-data2 = pd.DataFrame({
-    "tool": ["tool1", "tool2", "tool3", "tool4"],
-    "error": [0.1, 0.2, 0.3, 0.4]
-})
-
-data3 = pd.DataFrame({
-    "tool": ["tool1", "tool2", "tool3", "tool4", "tool5"],
-    "error": [0.1, 0.2, 0.3, 0.4, 0.5]
-})
-
-
-def update_plot1():
-    data = pd.DataFrame({
-        "tool": ["tool1", "tool2", "tool3", "tool4"],
-        "error": [0.1, 0.2, 0.3, 0.4]
-    })
-    return gr.BarPlot(
-        data,
-        x="tool",
-        y="error"
-    )
-
-def update_plot2():
-    data = pd.DataFrame({
-        "tool": ["tool1", "tool2", "tool3", "tool4", "tool5"],
-        "error": [0.1, 0.2, 0.3, 0.4, 0.5]
-    })
-    return gr.BarPlot(
-        data,
-        x="tool",
-        y="error"
-    )
-
-def update_plot3():
-    data = pd.DataFrame({
-        "tool": ["tool1", "tool2", "tool3", "tool4", "tool5", "tool6"],
-        "error": [0.1, 0.2, 0.3, 0.4, 0.5, 0.6]
-    })
-    return gr.BarPlot(
-        data,
-        x="tool",
-        y="error"
-    )
-
-def update_plots():
-    return update_plot1(), update_plot2(), update_plot3()
-
-with demo:
-    with gr.Row():
-        plot1 = gr.BarPlot(
-            data1,
-            x="tool",
-            y="error"
-        )
-    
-    with gr.Row():
-        plot2 = gr.BarPlot(
-            data2,
-            x="tool",
-            y="error"
-        )
-
-    with gr.Row():
-        plot3 = gr.BarPlot(
-            data3,
-            x="tool",
-            y="error"
-        )
-
-    with gr.Row():
-        update_button = gr.Button("Update")
-
-        update_button.click(
-            update_plots,
-            inputs=[],
-            outputs=[plot1, plot2, plot3]
-        )
-
-demo.launch(
-    debug=True
-)