mirror of
https://github.com/ANL-CEEESA/MIPLearn.git
synced 2025-12-09 10:58:51 -06:00
LearningSolver: Load each instance exactly twice during fit
This commit is contained in:
@@ -99,16 +99,6 @@ class Component(EnforceOverrides):
|
||||
"""
|
||||
return
|
||||
|
||||
def fit(
|
||||
self,
|
||||
training_instances: List[Instance],
|
||||
) -> None:
|
||||
x, y = self.xy_instances(training_instances)
|
||||
for cat in x.keys():
|
||||
x[cat] = np.array(x[cat], dtype=np.float32)
|
||||
y[cat] = np.array(y[cat])
|
||||
self.fit_xy(x, y)
|
||||
|
||||
def fit_xy(
|
||||
self,
|
||||
x: Dict[Hashable, np.ndarray],
|
||||
@@ -185,21 +175,49 @@ class Component(EnforceOverrides):
|
||||
) -> None:
|
||||
return
|
||||
|
||||
def xy_instances(
|
||||
self,
|
||||
def pre_sample_xy(self, instance: Instance, sample: Sample) -> None:
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def fit_multiple(
|
||||
components: Dict[str, "Component"],
|
||||
instances: List[Instance],
|
||||
) -> Tuple[Dict, Dict]:
|
||||
) -> None:
|
||||
x_combined: Dict = {}
|
||||
y_combined: Dict = {}
|
||||
for (cname, comp) in components.items():
|
||||
x_combined[cname] = {}
|
||||
y_combined[cname] = {}
|
||||
|
||||
# pre_sample_xy
|
||||
for instance in instances:
|
||||
instance.load()
|
||||
for sample in instance.samples:
|
||||
x_sample, y_sample = self.sample_xy(instance, sample)
|
||||
for cat in x_sample.keys():
|
||||
if cat not in x_combined:
|
||||
x_combined[cat] = []
|
||||
y_combined[cat] = []
|
||||
x_combined[cat] += x_sample[cat]
|
||||
y_combined[cat] += y_sample[cat]
|
||||
for (cname, comp) in components.items():
|
||||
comp.pre_sample_xy(instance, sample)
|
||||
instance.free()
|
||||
return x_combined, y_combined
|
||||
|
||||
# sample_xy
|
||||
for instance in instances:
|
||||
instance.load()
|
||||
for sample in instance.samples:
|
||||
for (cname, comp) in components.items():
|
||||
x = x_combined[cname]
|
||||
y = y_combined[cname]
|
||||
x_sample, y_sample = comp.sample_xy(instance, sample)
|
||||
for cat in x_sample.keys():
|
||||
if cat not in x:
|
||||
x[cat] = []
|
||||
y[cat] = []
|
||||
x[cat] += x_sample[cat]
|
||||
y[cat] += y_sample[cat]
|
||||
instance.free()
|
||||
|
||||
# fit_xy
|
||||
for (cname, comp) in components.items():
|
||||
x = x_combined[cname]
|
||||
y = y_combined[cname]
|
||||
for cat in x.keys():
|
||||
x[cat] = np.array(x[cat], dtype=np.float32)
|
||||
y[cat] = np.array(y[cat])
|
||||
comp.fit_xy(x, y)
|
||||
|
||||
Reference in New Issue
Block a user