Update app.py

app.py

@@ -3,15 +3,15 @@ import matplotlib.pyplot as plt
 
 def cmda_redevelopment_fsi_calculator(
     uds, num_owners, old_fsi, new_fsi,
-    guideline_value, construction_cost, current_area,
+    guideline_value, market_rate, construction_cost, current_area,
     builder_share_percent
 ):
-    # Step 1: Calculate built-up areas
+    # Step 1: Calculate buildable areas
     old_area = old_fsi * uds
     new_area = new_fsi * uds
     area_gain = new_area - old_area
 
-    # Step 2: Premium FSI
+    # Step 2: Premium FSI Charges (only beyond FSI 2.0)
     premium_fsi_factor = max(0, new_fsi - 2.0)
     premium_area = premium_fsi_factor * uds
     premium_fsi_charge = 0.4 * guideline_value * premium_area
@@ -22,69 +22,76 @@ def cmda_redevelopment_fsi_calculator(
     # Step 4: Builder Share
     builder_share_area = (builder_share_percent / 100) * new_area
     owner_share_area = new_area - builder_share_area
-    resale_value_builder = builder_share_area * guideline_value
+
+    # Resale value based on current market rate
+    resale_value_builder = builder_share_area * market_rate
     construction_cost_builder = builder_share_area * construction_cost
     builder_profit = resale_value_builder - construction_cost_builder - premium_fsi_charge
 
-    # Step 5: Owner-wise calculations
-    current_area_per_owner = current_area / num_owners
-    owner_area_per_person = owner_share_area / num_owners
-    gain_per_owner = owner_area_per_person - current_area_per_owner
+    # Step 5: Owner-wise area (based on UDS)
+    uds_per_owner = uds / num_owners
+    new_area_per_owner = owner_share_area / num_owners
+    net_gain_per_owner = new_area_per_owner - uds_per_owner
 
-    # Step 6: Plotting
+    # Step 6: Visualization
     fig, ax = plt.subplots(figsize=(6, 4))
     labels = ['Old FSI Area', 'New FSI Area', 'Premium FSI Area']
     values = [old_area, new_area, premium_area]
     ax.bar(labels, values, edgecolor='black')
-    ax.set_ylabel("Total Area (sq.ft)")
+    ax.set_ylabel("Area (sq.ft)")
     ax.set_title("FSI Area Comparison")
     plt.tight_layout()
 
-    return {
+    # Step 7: Output
+    result = {
         "Old FSI Buildable Area": f"{old_area:.2f} sq.ft",
         "New FSI Buildable Area": f"{new_area:.2f} sq.ft",
         "Total Area Gain": f"{area_gain:.2f} sq.ft",
         "Premium FSI Portion": f"{premium_area:.2f} sq.ft",
         "Premium FSI Charges": f"₹ {premium_fsi_charge:,.2f}",
         "Total Construction Cost (New FSI)": f"₹ {total_construction_cost:,.2f}",
+
         "--- Builder Deal Analysis ---": "",
         "Builder Share Area": f"{builder_share_area:.2f} sq.ft",
         "Owner Share Area": f"{owner_share_area:.2f} sq.ft",
-        "Resale Value of Builder Area": f"₹ {resale_value_builder:,.2f}",
+        "Resale Value (Builder Area @ Market Rate)": f"₹ {resale_value_builder:,.2f}",
         "Construction Cost for Builder": f"₹ {construction_cost_builder:,.2f}",
         "Estimated Builder Profit": f"₹ {builder_profit:,.2f}",
-        "--- Owner Breakdown ---": "",
-        "Current Area per Owner": f"{current_area_per_owner:.2f} sq.ft",
-        "New Area per Owner": f"{owner_area_per_person:.2f} sq.ft",
-        "Net Gain per Owner": f"{gain_per_owner:.2f} sq.ft"
-    }, fig
 
+        "--- Owner Breakdown (based on UDS) ---": "",
+        "UDS per Owner": f"{uds_per_owner:.2f} sq.ft",
+        "New Area per Owner": f"{new_area_per_owner:.2f} sq.ft",
+        "Net Gain per Owner": f"{net_gain_per_owner:.2f} sq.ft"
+    }
+
+    return result, fig
 
-# Gradio UI
+# Gradio Interface Setup
 inputs = [
     gr.Number(label="Current UDS (in sq.ft)", value=450),
     gr.Number(label="Number of Owners", value=4),
     gr.Number(label="Old FSI", value=1.5),
     gr.Number(label="New FSI (max 2.8)", value=2.8),
     gr.Number(label="Guideline Value (₹/sq.ft)", value=5000),
+    gr.Number(label="Market Rate (₹/sq.ft for sale)", value=9500),
     gr.Number(label="Construction Cost (₹/sq.ft)", value=3500),
     gr.Number(label="Current Total Area (in sq.ft)", value=1800),
-    gr.Slider(label="Builder Share (%) of Redeveloped Area", value=40, minimum=0, maximum=80, step=1)
+    gr.Slider(label="Builder Share (%) of Redeveloped Area", minimum=0, maximum=80, step=1, value=40)
 ]
 
 outputs = [
-    gr.JSON(label="CMDA Redevelopment & Builder Analysis"),
-    gr.Plot(label="FSI Area Comparison")
+    gr.JSON(label="CMDA Redevelopment Report"),
+    gr.Plot(label="FSI Area Comparison Chart")
 ]
 
 app = gr.Interface(
     fn=cmda_redevelopment_fsi_calculator,
     inputs=inputs,
     outputs=outputs,
-    title="CMDA Redevelopment Calculator with Builder Deal Estimator",
+    title="CMDA Redevelopment Calculator with Builder Profit Estimator",
     description=(
-        "Compare old vs new FSI, calculate premium FSI charges, construction costs, and simulate builder-owner deals. "
-        "Premium FSI is charged only beyond 2.0 FSI. Builder profit assumes resale at guideline value."
+        "Compare old and new FSI, calculate premium FSI charges, construction costs, and simulate builder profit "
+        "based on market resale rate. Assumes equal UDS share among owners."
     )
 )