Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified experiments/__pycache__/e.cpython-312.pyc
Binary file not shown.
Binary file modified experiments/__pycache__/e1.cpython-312.pyc
Binary file not shown.
Binary file modified experiments/__pycache__/e10.cpython-312.pyc
Binary file not shown.
Binary file modified experiments/__pycache__/e10_1.cpython-312.pyc
Binary file not shown.
Binary file modified experiments/__pycache__/e3.cpython-312.pyc
Binary file not shown.
Binary file modified experiments/__pycache__/e4.cpython-312.pyc
Binary file not shown.
Binary file modified experiments/__pycache__/e5.cpython-312.pyc
Binary file not shown.
Binary file modified experiments/__pycache__/e7.cpython-312.pyc
Binary file not shown.
Binary file modified experiments/__pycache__/e9.cpython-312.pyc
Binary file not shown.
2 changes: 1 addition & 1 deletion experiments/e.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from collections import defaultdict

# ==== project imports ====
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi

Expand Down
4 changes: 2 additions & 2 deletions experiments/e0.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
import matplotlib.pyplot as plt

# ==== project imports (unchanged) ====
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
from src.utils.online_stage_manager import StageManagerOnline
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi
from eval_coef_energy import HistSecantController
from grl_snam.eval_coef_energy import HistSecantController
import re

def mkdir(p):
Expand Down
4 changes: 2 additions & 2 deletions experiments/e1.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
import matplotlib.pyplot as plt

# ==== project imports ====
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi
from eval_coef_energy import HistSecantController
from grl_snam.eval_coef_energy import HistSecantController
import re

def mkdir(p): os.makedirs(p, exist_ok=True); return p
Expand Down
2 changes: 1 addition & 1 deletion experiments/e10.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from collections import defaultdict

# ==== project imports ====
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi

Expand Down
4 changes: 2 additions & 2 deletions experiments/e10_1.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
from collections import defaultdict

# ==== project imports ====
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi
from eval_coef_energy import HistSecantController
from grl_snam.eval_coef_energy import HistSecantController
import re

def mkdir(p): os.makedirs(p, exist_ok=True); return p
Expand Down
2 changes: 1 addition & 1 deletion experiments/e3.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import matplotlib.pyplot as plt

# Project imports
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi

Expand Down
2 changes: 1 addition & 1 deletion experiments/e4.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import matplotlib.pyplot as plt

# --- Project imports
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi

Expand Down
4 changes: 2 additions & 2 deletions experiments/e5.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import matplotlib.pyplot as plt

# ==== project imports ====
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi
from eval_coef_energy import HistSecantController
from grl_snam.eval_coef_energy import HistSecantController
import re

def mkdir(p): os.makedirs(p, exist_ok=True); return p
Expand Down
2 changes: 1 addition & 1 deletion experiments/e5_old.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import matplotlib.pyplot as plt

# ==== your project imports (unchanged) ====
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi
# ======================= DWA (fixed) =======================
Expand Down
2 changes: 1 addition & 1 deletion experiments/e7.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from tqdm import tqdm

# Project imports (match your repo)
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi

Expand Down
2 changes: 1 addition & 1 deletion experiments/e9.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import imageio.v3 as iio

# ---- Project imports (your codebase)
from train_coef_energy import CoefEnergyNet
from grl_snam.train_coef_energy import CoefEnergyNet
import scripts.ring_dataset_maxmin as gen
import scripts.spline_stagewise6 as ssi

Expand Down
2 changes: 1 addition & 1 deletion grl_snam/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
def __getattr__(name: str):
"""Lazy attribute access so heavy imports (torch) happen on demand."""
if name in {"CoefEnergyNet", "integrate_surrogate"}:
from train_coef_energy import CoefEnergyNet, integrate_surrogate # noqa: PLC0415
from grl_snam.train_coef_energy import CoefEnergyNet, integrate_surrogate # noqa: PLC0415

return {"CoefEnergyNet": CoefEnergyNet, "integrate_surrogate": integrate_surrogate}[name]
raise AttributeError(f"module 'grl_snam' has no attribute {name!r}")
2 changes: 1 addition & 1 deletion grl_snam/adaptation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

from __future__ import annotations

from eval_coef_energy import HistSecantController, OnlineFinetuner # noqa: F401
from grl_snam.eval_coef_energy import HistSecantController, OnlineFinetuner # noqa: F401

__all__ = ["HistSecantController", "OnlineFinetuner"]
2 changes: 1 addition & 1 deletion grl_snam/demos/austin_freedrive.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import numpy as np
import torch

import sdf_nav
import grl_snam.sdf_nav as sdf_nav
from grl_snam.demos._common import (
SimPacer,
current_host,
Expand Down
2 changes: 1 addition & 1 deletion grl_snam/demos/austin_learned.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import numpy as np
import torch

import sdf_nav
import grl_snam.sdf_nav as sdf_nav
from grl_snam.demos._common import (
SimPacer,
current_host,
Expand Down
2 changes: 1 addition & 1 deletion grl_snam/dynamics.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from __future__ import annotations

from surrogate_robust import ( # noqa: F401
from grl_snam.surrogate_robust import ( # noqa: F401
integrate_surrogate_v2,
multi_start_penalty,
)
Expand Down
Loading
Loading