combine subtasks

app.py

@@ -84,6 +84,12 @@ def _make_submit_handler(task_names: list[str]):
         user_dataset: str,
         profile: Optional[gr.OAuthProfile],
     ):
+        if task_name not in TASKS:
+            if len(task_names) == 1:
+                task_name = task_names[0]
+            else:
+                display_to_name = {TASKS[name].display_name: name for name in task_names}
+                task_name = display_to_name.get(task_name, task_name)
         owner_username = _profile_username(profile)
         result = submit_task(
             display_name=display_name,
@@ -113,6 +119,71 @@ def _dataframe(
     )
 
 
+def _property_material_groups() -> list[tuple[str, list[str]]]:
+    task = TASKS.get("propertyEstimation")
+    specs = getattr(task, "excel_summary_specs", {}) if task else {}
+    columns = list(specs.keys()) if isinstance(specs, dict) else []
+    return [
+        ("Newtonian", [col for col in columns if col.startswith("N ")]),
+        ("Non-Newtonian", [col for col in columns if col.startswith("NN ")]),
+        ("Elastic", [col for col in columns if col.startswith("E ")]),
+        ("Plasticine", [col for col in columns if col.startswith("P ")]),
+        ("Sand", [col for col in columns if col.startswith("S ")]),
+    ]
+
+
+def _metric_sort_value(value) -> float:
+    if value is None:
+        return float("inf")
+    text = str(value).strip()
+    if not text or text.lower() == "nan":
+        return float("inf")
+    try:
+        return float(text.split("+", 1)[0])
+    except ValueError:
+        return float("inf")
+
+
+def _property_material_df(leaderboard_df: pd.DataFrame, material_columns: list[str]) -> pd.DataFrame:
+    base_columns = ["#", "Team", *material_columns, "Scenes", "Updated At", "Submission"]
+    if leaderboard_df.empty:
+        return pd.DataFrame(columns=base_columns)
+    available_columns = [col for col in base_columns if col in leaderboard_df.columns]
+    rows = leaderboard_df[available_columns].copy()
+    metric_columns = [col for col in material_columns if col in rows.columns]
+    if metric_columns:
+        sort_col = metric_columns[0]
+        rows = rows.sort_values(
+            by=sort_col,
+            key=lambda series: series.map(_metric_sort_value),
+            na_position="last",
+        ).reset_index(drop=True)
+        if "#" in rows.columns:
+            rows["#"] = rows.index + 1
+    return rows
+
+
+def _property_material_dfs(leaderboard_df: pd.DataFrame) -> list[pd.DataFrame]:
+    return [
+        _property_material_df(leaderboard_df, material_columns)
+        for _title, material_columns in _property_material_groups()
+    ]
+
+
+def _render_property_material_tables(leaderboard_df: pd.DataFrame) -> list[gr.Dataframe]:
+    tables: list[gr.Dataframe] = []
+    for title, material_columns in _property_material_groups():
+        gr.Markdown(f"**{title} parameter leaderboard**")
+        tables.append(
+            _dataframe(
+                value=_property_material_df(leaderboard_df, material_columns),
+                elem_classes="leaderboard-table",
+                max_height=260,
+            )
+        )
+    return tables
+
+
 TASK_GROUPS = [
     {
         "slug": "video_generation",
@@ -175,16 +246,14 @@ TASK_GROUPS = [
             "Reinitialized Simulation Rendering, and Novel View Synthesis. "
             "Abbreviations: N=newtonian, NN=non-newtonian, E=elastic, P=plasticine, S=sand."
         ),
-        "expected_layout": TASKS["propertyEstimation_propertyEstimation"].expected_scene_layout,
+        "expected_layout": TASKS["propertyEstimation"].expected_scene_layout,
         "ranking": (
-            "- Excel-style summary cells are shown for the material-specific columns.\n"
-            "- `S φ` follows the raw `mean + std` convention from the Excel total table.\n"
-            "- Other material-parameter columns follow their configured scaling rules."
+            "- Ranking uses `rendering_pmf`, the mean of novel-view PMF and reinitialized-rendering PMF.\n"
+            "- Parameter-estimation metrics are shown as Excel-style material-specific summary cells.\n"
+            "- Novel and reinitialized rendering are evaluated with PSNR, SSIM, LPIPS, and PMF."
         ),
         "tasks": [
-            "propertyEstimation_propertyEstimation",
-            "propertyEstimation_reinitializedRendering",
-            "propertyEstimation_novelViewSynthesis",
+            "propertyEstimation",
         ],
         "meta_line": (
             "Subtasks: MPM Parameter Estimation · Reinitialized Simulation Rendering · Novel View Synthesis"
@@ -417,10 +486,30 @@ def _render_subtasks(task_names: list[str], page_title: str) -> None:
                     elem_classes="leaderboard-table",
                     max_height=380,
                 )
-                gr.Button("Refresh Leaderboard", size="sm", elem_classes="secondary-action").click(
-                    fn=lambda k=task_name: _safe_lb(k),
-                    outputs=leaderboard,
+                material_tables = (
+                    _render_property_material_tables(leaderboard_df)
+                    if task_name == "propertyEstimation"
+                    else []
+                )
+                refresh_leaderboard = gr.Button(
+                    "Refresh Leaderboard",
+                    size="sm",
+                    elem_classes="secondary-action",
                 )
+                if material_tables:
+                    def _reload_property_leaderboards(k=task_name):
+                        df = _safe_lb(k)
+                        return [df, *_property_material_dfs(df)]
+
+                    refresh_leaderboard.click(
+                        fn=_reload_property_leaderboards,
+                        outputs=[leaderboard, *material_tables],
+                    )
+                else:
+                    refresh_leaderboard.click(
+                        fn=lambda k=task_name: _safe_lb(k),
+                        outputs=leaderboard,
+                    )
             with gr.Accordion("Submission History", open=False, elem_classes="info-panel"):
                 history_df = _empty_history_df(task_name)
                 history = _dataframe(

src/display/css_html_js.py

@@ -423,6 +423,12 @@ button.primary:hover,
     box-shadow: none !important;
 }
 
+.data-table th,
+.data-table [role="columnheader"] {
+    font-size: 14px !important;
+    line-height: 1.25 !important;
+}
+
 .empty-task-note {
     width: 100% !important;
     max-width: 100% !important;

src/tasks/property_estimation/__init__.py

@@ -40,72 +40,60 @@ EXCEL_SUMMARY_SPECS = {
 
 
 TASK = TaskPlugin(
-    name="propertyEstimation_propertyEstimation",
-    display_name="Physical Property Estimation",
+    name="propertyEstimation",
+    display_name="Properties Estimation",
     description=(
         "Predict MPM material parameters and initial velocity. "
-        "This track covers MPM Parameter Estimation, Reinitialized Simulation Rendering, "
-        "and Novel View Synthesis. "
+        "This task jointly evaluates MPM Parameter Estimation, Reinitialized Simulation "
+        "Rendering, and Novel View Synthesis. "
         "Abbreviations: N=newtonian, NN=non-newtonian, E=elastic, P=plasticine, S=sand."
     ),
     expected_scene_layout=(
         "```\n"
         "<scene_id>.zip\n"
-        "|-- prediction.json\n"
-        "`-- initvelocity.json   # {\"vx\": float, \"vy\": float, \"vz\": float}\n"
+        "`-- property_estimation/\n"
+        "    |-- materials_configs.json\n"
+        "    |-- initvelocity.json   # {\"vx\": float, \"vy\": float, \"vz\": float}\n"
+        "    |-- novel/\n"
+        "    |   `-- CineCamera_*/rgb/<frame>.jpg\n"
+        "    `-- reinit/\n"
+        "        `-- CineCamera_*/rgb/<frame>.jpg\n"
         "```"
     ),
     validate_scene_fn=validate_scene,
     evaluate_scene_fn=evaluate_scene,
     load_gt_scene_fn=load_gt_scene,
-    primary_metric="overall_error",
-    higher_is_better=False,
+    primary_metric="rendering_pmf",
+    higher_is_better=True,
     leaderboard_columns=[
+        "rendering_pmf",
+        "novel_pmf",
+        "reinit_pmf",
+        "novel_psnr",
+        "novel_ssim",
+        "novel_lpips",
+        "reinit_psnr",
+        "reinit_ssim",
+        "reinit_lpips",
         "overall_error",
         *EXCEL_SUMMARY_SPECS.keys(),
     ],
 )
 
 TASK.excel_summary_specs = EXCEL_SUMMARY_SPECS
-TASK.column_display_names = {"overall_error": "overall"}
-
-TASK_PROPERTY_NOVEL_VIEW = TaskPlugin(
-    name="propertyEstimation_novelViewSynthesis",
-    display_name="Novel View Synthesis",
-    description="Evaluate novel-view rendering quality with PSNR / SSIM / LPIPS / PMF.",
-    expected_scene_layout=(
-        "```\n"
-        "<scene_id>.zip\n"
-        "|-- novel/\n"
-        "|   |-- CineCamera_1/rgb/0000.jpg\n"
-        "|   `-- CineCamera_8/rgb/0000.jpg\n"
-        "`-- reinit/\n"
-        "```\n"
-        "The same ZIP is shared by the Properties Estimation rendering subtasks."
-    ),
-    validate_scene_fn=validate_scene,
-    evaluate_scene_fn=evaluate_scene,
-    load_gt_scene_fn=load_gt_scene,
-    primary_metric="pmf",
-    higher_is_better=True,
-    leaderboard_columns=["psnr", "ssim", "lpips", "pmf"],
-)
-
-TASK_PROPERTY_REINIT = TaskPlugin(
-    name="propertyEstimation_reinitializedRendering",
-    display_name="Reinitialized Simulation Rendering",
-    description="Evaluate reinitialized-simulation rendering quality with PSNR / SSIM / LPIPS / PMF.",
-    expected_scene_layout=TASK_PROPERTY_NOVEL_VIEW.expected_scene_layout,
-    validate_scene_fn=validate_scene,
-    evaluate_scene_fn=evaluate_scene,
-    load_gt_scene_fn=load_gt_scene,
-    primary_metric="pmf",
-    higher_is_better=True,
-    leaderboard_columns=["psnr", "ssim", "lpips", "pmf"],
-)
+TASK.column_display_names = {
+    "rendering_pmf": "rendering pmf",
+    "novel_pmf": "novel pmf",
+    "reinit_pmf": "reinit pmf",
+    "novel_psnr": "novel psnr",
+    "novel_ssim": "novel ssim",
+    "novel_lpips": "novel lpips",
+    "reinit_psnr": "reinit psnr",
+    "reinit_ssim": "reinit ssim",
+    "reinit_lpips": "reinit lpips",
+    "overall_error": "param overall",
+}
 
 TASKS = {
     TASK.name: TASK,
-    TASK_PROPERTY_NOVEL_VIEW.name: TASK_PROPERTY_NOVEL_VIEW,
-    TASK_PROPERTY_REINIT.name: TASK_PROPERTY_REINIT,
 }