feat: minor cosmetic changes

app.py

@@ -14,10 +14,16 @@ except ImportError:
             rate -= npv / d_npv if d_npv else 0
         return rate
 
+def format_huf(x):
+    return f"{x:,.0f} HUF".replace(",", " ")
+
+def format_pct(x):
+    return f"{x*100:.2f}%"
+
 # ========== Core Model ==========
 def build_property_projection(purchase_price, equity, loan_years, annual_interest_rate,
-                              monthly_payment, monthly_rent, vacancy_months, annual_renovation,
-                              inflation_rate):
+                              monthly_payment, monthly_rent, vacancy_months,
+                              annual_renovation, inflation_rate):
     loan_balance = purchase_price - equity
     monthly_interest = annual_interest_rate / 12
     schedule = []
@@ -77,33 +83,17 @@ def compute_etf_irr(principal, years, annual_return):
     cashflows = [-principal] + [0] * (years - 1) + [round(final_value)]
     return irr(cashflows)
 
-def build_hybrid_projection(df_property, annual_return):
-    etf_balance = 0
-    projection = []
-    for _, row in df_property.iterrows():
-        etf_balance *= (1 + annual_return)
-        etf_balance += row["NetCashFlow"]
-        projection.append({"Year": row["Year"], "ETF_Balance": etf_balance})
-    return pd.DataFrame(projection)
-
-def compute_hybrid_irr(df_property, equity, df_hybrid, sell_property_at_end=True):
-    cashflows = [-equity]
-    for i, row in df_property.iterrows():
-        cf = 0
-        if i == len(df_property) - 1 and sell_property_at_end:
-            cf += row["PropertyValue"] - row["LoanBalance"]
-            cf += df_hybrid.iloc[-1]["ETF_Balance"]
-        else:
-            cf += row["NetCashFlow"]
-        cashflows.append(cf)
-    return irr(cashflows)
-
 # ========== Gradio App ==========
 def simulate(
-    purchase_price, equity, loan_years, annual_interest_rate,
+    purchase_price, equity, loan_years, annual_interest_rate_pct,
     monthly_payment, monthly_rent, vacancy_months, annual_renovation,
-    inflation_rate, etf_annual_return
+    inflation_rate_pct, etf_annual_return_pct
 ):
+    # Convert % to decimals
+    annual_interest_rate = annual_interest_rate_pct / 100
+    inflation_rate = inflation_rate_pct / 100
+    etf_annual_return = etf_annual_return_pct / 100
+
     # Property
     df_property = build_property_projection(purchase_price, equity, loan_years,
                                             annual_interest_rate, monthly_payment,
@@ -115,24 +105,27 @@ def simulate(
     df_etf = build_etf_projection(equity, loan_years, etf_annual_return)
     etf_irr = compute_etf_irr(equity, loan_years, etf_annual_return)
 
-    # Hybrid
-    df_hybrid = build_hybrid_projection(df_property, etf_annual_return)
-    hybrid_irr = compute_hybrid_irr(df_property, equity, df_hybrid)
-
     # Results summary
     summary = f"""
     📊 **Results after {loan_years} years**:
-    - Property IRR: {prop_irr*100:.2f}%
-    - ETF IRR: {etf_irr*100:.2f}%
-    - Hybrid IRR (Property + ETF cashflows): {hybrid_irr*100:.2f}%
+    - Property IRR: {format_pct(prop_irr)}
+    - ETF IRR: {format_pct(etf_irr)}
 
     💰 Final Values:
-    - Property Net Worth: {df_property.iloc[-1]['NetWorth']:,} HUF
-    - ETF Value: {df_etf.iloc[-1]['ETF_Value']:,} HUF
-    - Hybrid Value (Property + ETF): {df_property.iloc[-1]['NetWorth'] + df_hybrid.iloc[-1]['ETF_Balance']:,} HUF
+    - Property Net Worth: {format_huf(df_property.iloc[-1]['NetWorth'])}
+    - ETF Value: {format_huf(df_etf.iloc[-1]['ETF_Value'])}
     """
 
-    return summary, df_property, df_etf, df_hybrid
+    # Format tables for readability
+    df_property_fmt = df_property.copy()
+    for col in ["InterestPaid", "PrincipalPaid", "LoanBalance",
+                "RentIncome", "NetCashFlow", "PropertyValue", "NetWorth"]:
+        df_property_fmt[col] = df_property_fmt[col].apply(lambda x: format_huf(x))
+
+    df_etf_fmt = df_etf.copy()
+    df_etf_fmt["ETF_Value"] = df_etf_fmt["ETF_Value"].apply(lambda x: format_huf(x))
+
+    return summary, df_property_fmt, df_etf_fmt
 
 with gr.Blocks(title="Investment Simulator") as demo:
     gr.Markdown("# 🏠 vs 📈 Investment Simulator")
@@ -140,24 +133,23 @@ with gr.Blocks(title="Investment Simulator") as demo:
 
     with gr.Row():
         with gr.Column():
-            purchase_price = gr.Number(value=60_000_000, label="Purchase Price (HUF)")
-            equity = gr.Number(value=20_000_000, label="Equity (HUF)")
-            loan_years = gr.Number(value=20, label="Loan Term (years)")
-            annual_interest_rate = gr.Number(value=0.03, label="Annual Interest Rate (THM)")
-            monthly_payment = gr.Number(value=220_000, label="Monthly Loan Payment (HUF)")
-            monthly_rent = gr.Number(value=170_000, label="Monthly Rent (HUF)")
-            vacancy_months = gr.Number(value=1, label="Vacancy (months/year)")
-            annual_renovation = gr.Number(value=100_000, label="Annual Renovation (HUF)")
-            inflation_rate = gr.Number(value=0.045, label="Inflation Rate")
-            etf_annual_return = gr.Number(value=0.11, label="ETF Annual Return")
+            purchase_price = gr.Number(value=60_000_000, label="Purchase Price (HUF)", precision=0)
+            equity = gr.Number(value=20_000_000, label="Equity (HUF)", precision=0)
+            loan_years = gr.Number(value=20, label="Loan Term (years)", precision=0)
+            annual_interest_rate = gr.Number(value=3.0, label="Loan Interest (THM %)", precision=2)
+            monthly_payment = gr.Number(value=220_000, label="Monthly Loan Payment (HUF)", precision=0)
+            monthly_rent = gr.Number(value=170_000, label="Monthly Rent (HUF)", precision=0)
+            vacancy_months = gr.Number(value=1, label="Vacancy (months/year)", precision=0)
+            annual_renovation = gr.Number(value=100_000, label="Annual Renovation (HUF)", precision=0)
+            inflation_rate = gr.Number(value=4.5, label="Inflation Rate (%)", precision=2)
+            etf_annual_return = gr.Number(value=11.0, label="ETF Annual Return (%)", precision=2)
 
             run_button = gr.Button("Run Simulation")
 
         with gr.Column():
             results = gr.Markdown()
-            df_property_out = gr.Dataframe(interactive=False)
-            df_etf_out = gr.Dataframe(interactive=False)
-            df_hybrid_out = gr.Dataframe(interactive=False)
+            df_property_out = gr.Dataframe(interactive=False, wrap=True)
+            df_etf_out = gr.Dataframe(interactive=False, wrap=True)
 
     run_button.click(
         simulate,
@@ -166,7 +158,7 @@ with gr.Blocks(title="Investment Simulator") as demo:
             monthly_payment, monthly_rent, vacancy_months, annual_renovation,
             inflation_rate, etf_annual_return
         ],
-        outputs=[results, df_property_out, df_etf_out, df_hybrid_out]
+        outputs=[results, df_property_out, df_etf_out]
     )
 
 if __name__ == "__main__":