Changes to be committed:
modified: .gitignore deleted: Figure_1.png deleted: checkpoints/forward/best_tcn_model.pt deleted: checkpoints/forward/training_history.csv deleted: checkpoints_mlp/task1_feature_mlp/best_feature_mlp.pt deleted: checkpoints_mlp/task1_feature_mlp/training_history.csv deleted: checkpoints_rms/forward_rms/best_rms_model.pt deleted: checkpoints_rms/forward_rms/training_history.csv deleted: checkpoints_tree/task1_tr_tree/best_tr_tree.pkl deleted: checkpoints_tree/task1_tr_tree/model_selection.csv deleted: evaluation_outputs/forward/evaluation_forward_test_b0_s0.png deleted: evaluation_outputs/forward/evaluation_forward_val_b0_s0.png deleted: evaluation_outputs/forward/evaluation_forward_val_b3_s0.png deleted: evaluation_outputs/forward_rms/evaluation_test_all_samples.csv deleted: evaluation_outputs/forward_rms/evaluation_test_s0.png deleted: evaluation_outputs/forward_rms/evaluation_train_all_samples.csv deleted: evaluation_outputs/forward_rms/evaluation_val_all_samples.csv deleted: evaluation_outputs/forward_rms/evaluation_val_s0.png deleted: evaluation_outputs/forward_rms/evaluation_val_s0_waveform.png deleted: evaluation_outputs/task1_feature_mlp/evaluation_train_all_samples.csv deleted: evaluation_outputs/task1_feature_mlp/evaluation_train_curve.png deleted: evaluation_outputs/task1_feature_mlp/evaluation_val_all_samples.csv deleted: evaluation_outputs/task1_feature_mlp/evaluation_val_curve.png deleted: evaluation_outputs/task1_feature_mlp/evaluation_val_s0.png deleted: evaluation_outputs/task1_feature_mlp/harmonic_5mm_0.75Hz_prediction.png deleted: evaluation_outputs/task1_feature_mlp/harmonic_5mm_1.55Hz_prediction.png deleted: evaluation_outputs/task1_tr_tree/evaluation_train_all_samples.csv deleted: evaluation_outputs/task1_tr_tree/evaluation_train_curve.png deleted: evaluation_outputs/task1_tr_tree/evaluation_val_all_samples.csv deleted: evaluation_outputs/task1_tr_tree/evaluation_val_curve.png deleted: evaluation_outputs/task1_tr_tree/harmonic_5mm_1.55Hz_prediction.png deleted: sanity_check_alignment_forward.png new file: scripts/README.md modified: scripts/__pycache__/config.cpython-310.pyc modified: scripts/__pycache__/dataset.cpython-310.pyc deleted: scripts/__pycache__/model.cpython-310.pyc modified: scripts/config.py modified: scripts/dataset.py modified: scripts/evaluate.py deleted: scripts/model.py modified: scripts/predict_single.py deleted: scripts/train.py new file: scripts/train_final.py deleted: scripts_tree/__pycache__/config.cpython-310.pyc deleted: scripts_tree/config.py deleted: scripts_tree/evaluate.py deleted: scripts_tree/predict_single.py deleted: scripts_tree/train.py deleted: src/__pycache__/config.cpython-310.pyc deleted: src/__pycache__/config.cpython-314.pyc deleted: src/__pycache__/dataset.cpython-310.pyc deleted: src/__pycache__/dataset.cpython-314.pyc deleted: src/__pycache__/model.cpython-310.pyc deleted: src/__pycache__/model.cpython-314.pyc deleted: src/config.py deleted: src/dataset.py deleted: src/evaluate.py deleted: src/model.py deleted: src/sanity_check.py deleted: src/train.py deleted: src_new/__pycache__/config.cpython-310.pyc deleted: src_new/__pycache__/dataset.cpython-310.pyc deleted: src_new/__pycache__/evaluate.cpython-310.pyc deleted: src_new/__pycache__/model.cpython-310.pyc deleted: src_new/__pycache__/train.cpython-310.pyc deleted: src_new/config.py deleted: src_new/dataset.py deleted: src_new/evaluate.py deleted: src_new/model.py deleted: src_new/train.py deleted: src_old/__init__.py deleted: src_old/__pycache__/config.cpython-310.pyc deleted: src_old/__pycache__/config.cpython-314.pyc deleted: src_old/__pycache__/dataset.cpython-310.pyc deleted: src_old/__pycache__/dataset.cpython-314.pyc deleted: src_old/__pycache__/evaluate.cpython-314.pyc deleted: src_old/__pycache__/model.cpython-310.pyc deleted: src_old/__pycache__/model.cpython-314.pyc deleted: src_old/__pycache__/train.cpython-310.pyc deleted: src_old/__pycache__/train.cpython-314.pyc deleted: src_old/config.py deleted: src_old/dataset.py deleted: src_old/evaluate.py deleted: src_old/model.py deleted: src_old/train.py
This commit is contained in:
@@ -5,34 +5,18 @@ from pathlib import Path
|
||||
|
||||
|
||||
CORE_FEATURE_NAMES: tuple[str, ...] = (
|
||||
"dominant_frequency_hz",
|
||||
"frequency_hz",
|
||||
"frequency_squared",
|
||||
"inverse_frequency_hz",
|
||||
"log_frequency_hz",
|
||||
"input_rms",
|
||||
"input_peak_abs",
|
||||
"input_peak_to_peak",
|
||||
"crest_factor",
|
||||
"middle_length_ratio",
|
||||
"dominant_amplitude",
|
||||
"dominant_energy_ratio",
|
||||
"harmonic_fit_amplitude",
|
||||
"harmonic_fit_residual_ratio",
|
||||
"spectral_peak_prominence",
|
||||
"half_power_bandwidth_hz",
|
||||
"spectral_centroid_hz",
|
||||
"signal_mean",
|
||||
"x_rms",
|
||||
"theoretical_accel",
|
||||
)
|
||||
|
||||
|
||||
@dataclass
|
||||
class DataConfig:
|
||||
project_root: Path = field(default_factory=lambda: Path(__file__).resolve().parents[1])
|
||||
scenario: str = "Non_TMD"
|
||||
train_split_name: str = "train"
|
||||
val_split_name: str = "val"
|
||||
test_split_name: str = "test"
|
||||
csv_pattern: str = "*.csv"
|
||||
data_dir: str = "downloads/Non_TMD"
|
||||
harmonic_pattern: str = "harmonic*.csv"
|
||||
|
||||
code_column: str = "code"
|
||||
time_column: str = "time"
|
||||
@@ -49,52 +33,31 @@ class DataConfig:
|
||||
stability_subwindow_count: int = 4
|
||||
interpolation_method: str = "linear"
|
||||
normalization_eps: float = 1e-6
|
||||
harmonic_amplitude_m: float = 0.005
|
||||
|
||||
downloads_dir: Path = field(init=False)
|
||||
scenario_dir: Path = field(init=False)
|
||||
train_dir: Path = field(init=False)
|
||||
val_dir: Path = field(init=False)
|
||||
test_dir: Path = field(init=False)
|
||||
data_root: Path = field(init=False)
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
self.project_root = Path(self.project_root).resolve()
|
||||
self.downloads_dir = self.project_root / "downloads"
|
||||
self.scenario_dir = self.downloads_dir / self.scenario
|
||||
self.train_dir = self.scenario_dir / self.train_split_name
|
||||
self.val_dir = self.scenario_dir / self.val_split_name
|
||||
self.test_dir = self.scenario_dir / self.test_split_name
|
||||
self.data_root = (self.project_root / self.data_dir).resolve()
|
||||
|
||||
|
||||
@dataclass
|
||||
class ModelConfig:
|
||||
input_dim: int = len(CORE_FEATURE_NAMES)
|
||||
hidden_dims: tuple[int, ...] = (96, 64, 32)
|
||||
dropout: float = 0.08
|
||||
model_name: str = "knn_distance"
|
||||
n_neighbors: int = 4
|
||||
distance_power: int = 2
|
||||
|
||||
|
||||
@dataclass
|
||||
class TrainConfig:
|
||||
epochs: int = 400
|
||||
batch_size: int = 16
|
||||
learning_rate: float = 1e-3
|
||||
weight_decay: float = 1e-4
|
||||
seed: int = 42
|
||||
device: str = "cuda"
|
||||
grad_clip_norm: float = 1.0
|
||||
lr_scheduler_patience: int = 20
|
||||
lr_scheduler_factor: float = 0.5
|
||||
min_learning_rate: float = 1e-6
|
||||
early_stop_patience: int = 50
|
||||
checkpoint_dir: str = "checkpoints_mlp"
|
||||
history_name: str = "training_history.csv"
|
||||
best_model_name: str = "best_feature_mlp.pt"
|
||||
|
||||
|
||||
@dataclass
|
||||
class LossConfig:
|
||||
relative_rms_weight: float = 1.0
|
||||
log_rms_huber_weight: float = 0.75
|
||||
mae_weight: float = 0.15
|
||||
checkpoint_dir: str = "checkpoints_final"
|
||||
model_name: str = "task1_final_model.pkl"
|
||||
fit_csv_name: str = "task1_final_fit_all.csv"
|
||||
fit_figure_name: str = "task1_final_fit_curve.png"
|
||||
dense_curve_csv_name: str = "task1_final_dense_curve.csv"
|
||||
evaluation_dense_csv_name: str = "evaluation_dense_curve.csv"
|
||||
dense_curve_points: int = 400
|
||||
|
||||
|
||||
@dataclass
|
||||
@@ -102,8 +65,19 @@ class ExperimentConfig:
|
||||
data: DataConfig = field(default_factory=DataConfig)
|
||||
model: ModelConfig = field(default_factory=ModelConfig)
|
||||
train: TrainConfig = field(default_factory=TrainConfig)
|
||||
loss: LossConfig = field(default_factory=LossConfig)
|
||||
|
||||
|
||||
def make_experiment_config() -> ExperimentConfig:
|
||||
return ExperimentConfig()
|
||||
|
||||
|
||||
def checkpoint_dir(config: ExperimentConfig) -> Path:
|
||||
path = config.data.project_root / config.train.checkpoint_dir / "task1_final"
|
||||
path.mkdir(parents=True, exist_ok=True)
|
||||
return path
|
||||
|
||||
|
||||
def evaluation_dir(config: ExperimentConfig) -> Path:
|
||||
path = config.data.project_root / "evaluation_outputs" / "task1_final"
|
||||
path.mkdir(parents=True, exist_ok=True)
|
||||
return path
|
||||
|
||||
Reference in New Issue
Block a user