Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ITC model now works #5

Merged
merged 8 commits into from
Sep 17, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
renamed organizer -> global_model
  • Loading branch information
harmsm committed Sep 17, 2024
commit 57157817a60c159e7410fff5c317b232e6c7a069
2 changes: 1 addition & 1 deletion src/linkage/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import linkage
from linkage.experiment import Experiment
from linkage.organizer import GlobalModel
from linkage.global_model import GlobalModel


# Make a list of all classes in linkage.models
1 change: 1 addition & 0 deletions src/linkage/global_model/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from linkage.global_model.global_model import GlobalModel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import linkage.models
from linkage.organizer.point.spec_point import SpecPoint
from linkage.organizer.point.itc_point import ITCPoint
from linkage.global_model.point.spec_point import SpecPoint
from linkage.global_model.point.itc_point import ITCPoint

import numpy as np
import pandas as pd
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

from linkage.organizer.point.experimental_point import ExperimentalPoint
from linkage.global_model.point.experimental_point import ExperimentalPoint

import numpy as np

File renamed without changes.
1 change: 0 additions & 1 deletion src/linkage/organizer/__init__.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

from linkage.organizer.point.experimental_point import ExperimentalPoint
from linkage.global_model.point.experimental_point import ExperimentalPoint

import numpy as np

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

from linkage.organizer.point.itc_point import ITCPoint
from linkage.global_model.point.itc_point import ITCPoint

import numpy as np

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

from linkage.organizer.point.spec_point import SpecPoint
from linkage.global_model.point.spec_point import SpecPoint

import numpy as np

Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@
import pytest

import linkage
from linkage.organizer.global_model import GlobalModel
from linkage.organizer.point.spec_point import SpecPoint
from linkage.organizer.point.itc_point import ITCPoint
from linkage.global_model.global_model import GlobalModel
from linkage.global_model.point.spec_point import SpecPoint
from linkage.global_model.point.itc_point import ITCPoint

from linkage.experiment.experiment import Experiment