X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Futil%2FTestEnvironmentHelper.java;h=a71c9de374d5d3e4dd63bab85178b2f5a4786682;hb=552986fd8718d5f2db00802015fdd1ecd58a5a2f;hp=bf8ee36394a30f9505786e90a6ed9c23b80cf6cf;hpb=78136f2ede87e1c22239cff89cbd563d0d1daae6;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java index bf8ee363..a71c9de3 100644 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java +++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java @@ -27,8 +27,8 @@ import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.modeladapter.LogicModelParameters; -import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; +import net.mograsim.logic.model.modeladapter.CoreModelParameters; +import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.util.ModellingTool; @@ -87,11 +87,11 @@ public class TestEnvironmentHelper component.getPins().values().forEach(this::extendModelPin); - // Create logic model - LogicModelParameters params = new LogicModelParameters(); + // Create core model + CoreModelParameters params = new CoreModelParameters(); params.gateProcessTime = 50; params.wireTravelTime = 10; - timeline = ViewLogicModelAdapter.convert(viewModel, params); + timeline = LogicCoreAdapter.convert(viewModel, params); timelineField.ifPresent(f -> setField(f, timeline)); // Bind switches/displays to this test class