hzhang/Enigmos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor programmable modules

Browse Source
This commit is contained in:
h z
2024-07-06 02:12:54 +01:00
parent be5428d708
commit 3eec8a1345
26 changed files with 329 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Modules/InterlayerModules/FilterOutputModule.cs
View File

@@ -1,43 +0,0 @@
using Godot;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Enigmos.Modules.ComputationalModules;
using Nocturnis.GlobalManagement.Constants;
namespace Enigmos.Modules.InterlayerModules;
public partial class FilterOutputModule : NullaryComputationalModule, IInterlayerModule
{
public override Vector2 PositionToBoard => base.PositionToBoard + (ParentModule?.PositionToBoard ?? Vector2.Zero);
public IFilterModule FilterModule
{
get => (ParentModule as IFilterModule)!;
set => ParentModule = value;
}
public IDataOutPort? Output { get; set; }
public override IEnumerable<IBasePort> Ports => new[] { Output! };
protected override bool Draggable => false;
protected override bool HasManual => false;
public override void Init()
{
base.Init();
this.DataOutInit("Output", 1);
Output = DataOutPorts[0];
PostInit();
}
public override void Define()
{
FilterModule.Filter();
Output!.OutData.UpdateCalculation(
cache => (FilterModule.CachedResult, EnigmosConstant.DataPortTypes.AnyArrayType)
);
}
public IBasePort UnderlyingPort => Output!;
public IProgrammableModule? ParentModule { get; set; }
}

13
Modules/InterlayerModules/InterlayerDataInModule.cs
View File

@@ -1,17 +1,18 @@
using Godot;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
namespace Enigmos.Modules.InterlayerModules;
public partial class InterlayerDataInModule : BaseModule, IInterlayerDataInModule
public partial class InterlayerDataInModule : SubModule, IInterlayerDataInModule
{
protected override bool HasManual => false;
public override Vector2 PositionToBoard => base.PositionToBoard + (ParentModule?.PositionToBoard ?? Vector2.Zero);
public IProgrammableModule? ParentModule { get; set; }
protected override bool Draggable => false;
public IBasePort? UnderlyingPort => DataIn;
public new IProgrammableModule? ParentModule
{
get => base.ParentModule as IProgrammableModule;
set => base.ParentModule = value;
}
public IInterlayerDataOutModule? DualModule { get; set; }
public IDataInPort? DataIn { get; set; }
public override IEnumerable<IBasePort> Ports => new[] { DataIn }!;

14
Modules/InterlayerModules/InterlayerDataOutModule.cs
View File

@@ -8,13 +8,15 @@ using Nocturnis.Enigmos.Ports.DataPorts.Directions;
namespace Enigmos.Modules.InterlayerModules;
public partial class InterlayerDataOutModule : ComputationalModule, IInterlayerDataOutModule
public partial class InterlayerDataOutModule : SubModule, IComputationalModule, IInterlayerDataOutModule
{
public override Vector2 PositionToBoard => base.PositionToBoard + (ParentModule?.PositionToBoard ?? Vector2.Zero);
public IProgrammableModule? ParentModule { get; set; }
public new IProgrammableModule? ParentModule
{
get => base.ParentModule as IProgrammableModule;
set => base.ParentModule = value;
}
protected override bool Draggable => false;
protected override bool HasManual => false;
public IDataOutPort[] DataOutPorts { get; set; }
public IBasePort UnderlyingPort => DataOut!;
public IInterlayerDataInModule? DualModule { get; set; }
public IDataOutPort? DataOut { get; set; }
@@ -28,7 +30,7 @@ public partial class InterlayerDataOutModule : ComputationalModule, IInterlayerD
PostInit();
}
public override void Define()
public void Define()
{
DataOut!.OutData = DualModule!.DataIn!.GetData;
}

11
Modules/InterlayerModules/InterlayerSignalInModule.cs
View File

@@ -6,12 +6,13 @@ using Nocturnis.Enigmos.Ports.SignalPorts.Directions;
namespace Enigmos.Modules.InterlayerModules;
public partial class InterlayerSignalInModule : BaseModule, IInterlayerSignalInModule
public partial class InterlayerSignalInModule : SubModule, IInterlayerSignalInModule
{
public override Vector2 PositionToBoard => base.PositionToBoard + (ParentModule?.PositionToBoard ?? Vector2.Zero);
public IProgrammableModule? ParentModule { get; set; }
protected override bool Draggable => false;
protected override bool HasManual => false;
public new IProgrammableModule? ParentModule
{
get => base.ParentModule as IProgrammableModule;
set => base.ParentModule = value;
}
public IBasePort UnderlyingPort => SignalIn!;
public IInterlayerSignalOutModule? DualModule { get; set; }
public ISignalInPort? SignalIn { get; set; }

16
Modules/InterlayerModules/InterlayerSignalOutModule.cs
View File

@@ -1,4 +1,3 @@
using Godot;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports;
@@ -6,13 +5,13 @@ using Nocturnis.Enigmos.Ports.SignalPorts.Directions;
namespace Enigmos.Modules.InterlayerModules;
public partial class InterlayerSignalOutModule : BaseModule, IInterlayerSignalOutModule
public partial class InterlayerSignalOutModule : SubModule, IInterlayerSignalOutModule
{
public override Vector2 PositionToBoard =>
base.PositionToBoard + (ParentModule?.PositionToBoard ?? Vector2.Zero);
public IProgrammableModule? ParentModule { get; set; }
protected override bool Draggable => false;
protected override bool HasManual => false;
public new IProgrammableModule? ParentModule
{
get => base.ParentModule as IProgrammableModule;
set => base.ParentModule = value;
}
public IBasePort UnderlyingPort => SignalOut!;
public IInterlayerSignalInModule? DualModule { get; set; }
public ISignalOutPort? SignalOut { get; set; }
@@ -27,7 +26,4 @@ public partial class InterlayerSignalOutModule : BaseModule, IInterlayerSignalOu
SignalOut = SignalOutPorts[0];
PostInit();
}
public bool Visited { get; set; }
}

39
Modules/InterlayerModules/IterativeOutputModule.cs
View File

@@ -1,39 +0,0 @@
using Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants;
namespace Enigmos.Modules.InterlayerModules;
public partial class IterativeOutputModule : NullaryComputationalModule, IInterlayerModule, IDuplicateOutputModule
{
protected override bool Draggable => false;
protected override bool HasManual => false;
public IDataOutPort? Output { get; set; }
public override IEnumerable<IBasePort> Ports => new[] { Output }!;
public override void Init()
{
base.Init();
this.DataOutInit("DataOut", 1);
Output = DataOutPorts[0];
PostInit();
}
public override void Define()
{
if (ParentModule is IOptimizationModule opm)
this.Define(cache => (opm.CachedResult.Data, opm.CachedResult.Type)!);
if (ParentModule is IFilterModule fm)
this.Define(cache => (fm.CachedResult, EnigmosConstant.DataPortTypes.AnyArrayType));
}
//protected override void Compute(IRootModule root) => throw new Exception("Should be Handled by Other Module");
public IBasePort UnderlyingPort => Output!;
public IProgrammableModule? ParentModule { get; set; }
}

42
Modules/InterlayerModules/OptimizationItemOutputModule.cs
View File

@@ -1,42 +0,0 @@
using Enigmos.Modules.ComputationalModules;
using Godot;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
namespace Enigmos.Modules.InterlayerModules;
public partial class OptimizationItemOutputModule : NullaryComputationalModule, IInterlayerModule
{
public override Vector2 PositionToBoard =>
base.PositionToBoard + (OptimizationModule?.PositionToBoard ?? Vector2.Zero);
protected override bool Draggable => false;
protected override bool HasManual => false;
public IOptimizationModule OptimizationModule
{
get => (ParentModule as IOptimizationModule)!;
set => ParentModule = value;
}
public IDataOutPort DataOut { get; set; }
public override IEnumerable<IBasePort> Ports => new[] { DataOut };
//protected override void Compute(IRootModule root) => OptimizationModule.OptimizeWithTimeoutHandle(root);
public override void Init()
{
base.Init();
this.DataOutInit("DataOut", 1);
DataOut = DataOutPorts[0];
PostInit();
}
public IBasePort UnderlyingPort => DataOut;
public IProgrammableModule? ParentModule { get; set; }
public override void Define()
{
IOptimizationModule im = (ParentModule as IOptimizationModule)!;
DataOut.OutData.UpdateCalculation(cache => (im.CachedResult.Data, im.CachedResult.Type)!);
}
}

44
Modules/InterlayerModules/OptimizationValueOutputModule.cs
View File

@@ -1,44 +0,0 @@
using Enigmos.Modules.ComputationalModules;
using Enigmos.Ports;
using Enigmos.Ports.DataPorts;
using Godot;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants;
namespace Enigmos.Modules.InterlayerModules;
public partial class OptimizationValueOutputModule : NullaryComputationalModule,
IInterlayerModule,
IDuplicateOutputModule
{
public override Vector2 PositionToBoard =>
base.PositionToBoard + (OptimizationModule?.PositionToBoard ?? Vector2.Zero);
protected override bool Draggable => false;
protected override bool HasManual => false;
public DataOutPort? DataOut { get; set; }
public IOptimizationModule OptimizationModule
{
get => (ParentModule as IOptimizationModule)!;
set => ParentModule = value;
}
public override IEnumerable<BasePort> Ports => new[] { DataOut }!;
public override void Init()
{
base.Init();
this.DataOutInit("DataOut", 1);
DataOut.SetDataType(EnigmosConstant.DataPortTypes.Real);
PostInit();
}
public override void Define()
{
this.Define(cache => (OptimizationModule.CachedResult.Data, OptimizationModule.CachedResult.Type) );
}
public IBasePort UnderlyingPort => DataOut;
public IProgrammableModule? ParentModule { get; set; }
}