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

15
Modules/ProgrammableModules/FilterModule/FilterIndicateModule.cs Normal file
View File

@@ -0,0 +1,15 @@
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
namespace Enigmos.Modules.ProgrammableModules.FilterModule;
public partial class FilterIndicateModule : SubModule
{
public IDataInPort? Indicate { get; set; }
public override void Init()
{
base.Init();
Indicate = this.GetPort<IDataInPort>("Indicate");
}
}

37
Modules/ProgrammableModules/FilterModule/FilterInputProviderModule.cs Normal file
View File

@@ -0,0 +1,37 @@
using Enigmos.Boards;
using Godot;
using Nocturnis.DataStructures;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Skeleton.DataStructure;
namespace Enigmos.Modules.ProgrammableModules.FilterModule;
public partial class FilterInputProviderModule : SubModule, IComputationalModule
{
public IDataOutPort[] DataOutPorts { get; set; } = Array.Empty<IDataOutPort>();
public override IEnumerable<IBasePort> Ports => DataOutPorts;
public IDataOutPort? Output { get; set; }
public FilterModuleBoard? ParentBoard { get; set; }
public void Init(FilterModuleBoard board)
{
base.Init();
ParentBoard = board;
this.DataOutInit("Output", 1);
Output = DataOutPorts[0];
PostInit();
}
public void Define()
{
(object, StringName) Func(CacheItem c)
{
IData w = ParentBoard!.FilterModule!.CachedInputArray[ParentBoard.FilterModule.ProcessingIndex];
return (w.Data, w.Type)!;
}
Output!.OutData.UpdateCalculation(Func);
}
}

99
Modules/ProgrammableModules/FilterModule.cs → Modules/ProgrammableModules/FilterModule/FilterModule.cs
View File

@@ -1,9 +1,5 @@
using Enigmos.Boards;
using Enigmos.Exceptions;
using Enigmos.Modules.ControllingModules;
using Enigmos.Modules.InterlayerModules;
using Enigmos.Modules.Other;
using Enigmos.Ports.DataPorts;
using Nocturnis.DataStructures;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.Enigmos.Modules;
@@ -14,107 +10,100 @@ using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Modules.ProgrammableModules;
namespace Enigmos.Modules.ProgrammableModules.FilterModule;
public partial class FilterModule : ProgrammableModule, IPolymorphismModule, IFilterModule
{
private IDataInPort? Input { get; set; }
public IDataInPort? InputArray { get; set; }
public FilterOutputModule? OutputArrayModule { get; set; }
private IInterlayerDataInModule[] ExplicitInputs { get; set; } = Array.Empty<IInterlayerDataInModule>();
private FilterOutputModule? Output { get; set; }
private IterativeOutputModule? IterativeOutput { get; set; }
private IndicateInputModule? Indicate { get; set; }
private IDataPortGroup[] InterLayerGroups { get; set; } = Array.Empty<IDataPortGroup>();
private IDataPortGroup? ArrayGroup { get; set; }
private bool FilterEnded { get; set; }
private IData[] CachedInputArray { get; set; } = Array.Empty<IData>();
public IData[] CachedInputArray { get; set; } = Array.Empty<IData>();
public IData[] CachedResult { get; set; } = Array.Empty<IData>();
public bool FilterFinished { get; set; }
public bool FilterStarted { get; set; }
private List<IData> CachedListResult { get; set; } = new();
//private List<IData> CachedResult { get; set; } = new();
private int CachedIndex { get; set; }
public int ProcessingIndex { get; set; }
public new FilterModuleBoard UnderlyingBoard
{
get => (base.UnderlyingBoard as FilterModuleBoard)!;
set => base.UnderlyingBoard = value;
}
public override IEnumerable<IBasePort> Ports => new IBasePort[] { InputArray!, OutputArrayModule!.Output! };
public override IEnumerable<IBasePort> Ports => new[] { Input! };
public override IBaseModule[] SubModules() => ExplicitInputs.Union<IBaseModule>(new[] { Output! }).ToArray();
public override IBaseModule[] SubModules => ExplicitInputs;
public override IEnumerable<IBasePort> ExplicitPorts =>
new IBasePort[] { Output!.Output! }
new IBasePort[] { InputArray!, OutputArrayModule!.Output! }
.Union(ExplicitInputs.Select(c => c.DataIn))!
.ToArray<IBasePort>();
public override IEnumerable<IBasePort> ImplicitPorts =>
new IBasePort[] { IterativeOutput!.Output!, Indicate!.Input! }
.Union(UnderlyingBoard.Outputs.Select(c => c.DataOut))
new IBasePort[] { OutputArrayModule!.Output!, InputArray! }
.Union(UnderlyingBoard.FilterInputProxy.Select(c => c.DataOut))
.ToArray()!;
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
public void Inference() => IterativeOutput!.Output!
.SetDataType(GlobalProvider.DataStructureProvider!.ArrayToElement(ArrayGroup!.SelectedType));
public void Inference()
{
}
public void Filter()
{
if (FilterEnded)
if (!FilterStarted)
{
CachedInputArray = Input!.GetData.Get!.Array;
CachedIndex = 0;
CachedInputArray = InputArray!.GetData.Get!.Array;
ProcessingIndex = 0;
CachedListResult = new List<IData>();
FilterStarted = true;
}
while (CachedIndex < CachedInputArray.Length)
while (ProcessingIndex < CachedInputArray.Length)
{
SoftReset();
IterativeOutput!.Output!.OutData.UpdateCalculation(cache =>
(CachedInputArray[CachedIndex].Data, IterativeOutput.Output.DataType)!);
IterativeOutput.Output.OutData.Expire();
if(Indicate!.Input!.GetData.Get!.Bit)
CachedListResult.Add(CachedInputArray[CachedIndex]);
CachedIndex += 1;
UnderlyingBoard.InputProvider!.Define();
UnderlyingBoard.InputProvider.Output!.OutData.Expire();
if(UnderlyingBoard.Indicate!.Indicate!.GetData.Get!.Bit)
CachedListResult.Add(CachedInputArray[ProcessingIndex]);
ProcessingIndex += 1;
}
CachedResult = CachedListResult.ToArray();
FilterEnded = true;
FilterFinished = true;
FilterStarted = false;
}
private void SoftReset() => UnderlyingBoard.Reset();
public override void Init()
{
base.Init();
InputArray = this.GetPort<IDataInPort>("InputArray");
OutputArrayModule = GetModule<FilterOutputModule>("OutputArray");
UnderlyingBoard = GlobalProvider.SceneProvider!
.AssetMapper<FilterModuleBoard>()
.Instantiate<FilterModuleBoard>();
UnderlyingBoard.Init();
ExplicitInputs = new InterlayerDataInModule[3];
InterLayerGroups = new IDataPortGroup[3];
IterativeOutput = UnderlyingBoard.IterativeOutput;
IterativeOutput.Output.SetDataType(EnigmosConstant.DataPortTypes.Real);
Indicate = UnderlyingBoard.Indicate;
ExplicitInputs = new IInterlayerDataInModule[3];
for (int i = 0; i < 3; i++)
{
ExplicitInputs[i] = GetModule<InterlayerDataInModule>($"EI{i + 1}");
ExplicitInputs[i].DualModule = UnderlyingBoard.Outputs[i];
UnderlyingBoard.Outputs[i].DualModule = ExplicitInputs[i];
}
FilterEnded = true;
OutputArrayModule.Init(this);
UnderlyingBoard.Init(this);
FilterFinished = false;
FilterStarted = false;
Input = this.GetPort<DataInPort>("Input");
Output = GetModule<FilterOutputModule>("Output");
for (int i = 0; i < 3; i++)
{
InterLayerGroups[i] = GlobalProvider.DataStructureProvider.NewDataPortGroup(
InterLayerGroups[i] = GlobalProvider.DataStructureProvider!.NewDataPortGroup(
this,
new IDataPort[] { ExplicitInputs[i].DataIn, UnderlyingBoard.Outputs[i].DataOut },
new IDataPort[] { ExplicitInputs[i].DataIn!, UnderlyingBoard.FilterInputProxy[i].DataOut! },
$"Exterior In -> Interior Out{i}",
EnigmosConstant.DataPortTypes.Real,
EnigmosConstant.DataPortTypes.AnyType
@@ -124,7 +113,7 @@ public partial class FilterModule : ProgrammableModule, IPolymorphismModule, IFi
ArrayGroup = GlobalProvider.DataStructureProvider!.NewDataPortGroup(
this,
new IDataPort[] { Input, Output.Output! },
new IDataPort[] { InputArray, OutputArrayModule.Output! },
"Array Type",
EnigmosConstant.DataPortTypes.RealArray,
EnigmosConstant.DataPortTypes.AnyArray
@@ -133,8 +122,6 @@ public partial class FilterModule : ProgrammableModule, IPolymorphismModule, IFi
ConfigurablePortGroups = InterLayerGroups.Union(new[] { ArrayGroup }).ToHashSet();
PostInit();
}
}
}

41
Modules/ProgrammableModules/FilterModule/FilterOutputModule.cs Normal file
View File

@@ -0,0 +1,41 @@
using Godot;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants;
using Skeleton.DataStructure;
namespace Enigmos.Modules.ProgrammableModules.FilterModule;
public partial class FilterOutputModule : SubModule, IComputationalModule
{
public IDataOutPort[] DataOutPorts { get; set; } = Array.Empty<IDataOutPort>();
public IDataOutPort? Output { get; set; }
public override IEnumerable<IBasePort> Ports => DataOutPorts;
public new IFilterModule? ParentModule {
get => base.ParentModule as IFilterModule;
set => base.ParentModule = value;
}
public void Init(IFilterModule parent)
{
base.Init();
this.DataOutInit("Output", 1);
Output = DataOutPorts[0];
ParentModule = parent;
PostInit();
}
public void Define()
{
(object, StringName) Func(CacheItem c)
{
if (!ParentModule!.FilterFinished)
ParentModule!.Filter();
return (ParentModule!.CachedResult, EnigmosConstant.DataPortTypes.AnyArrayType);
}
Output!.OutData.UpdateCalculation(Func);
}
}

4
Modules/ProgrammableModules/FunctionModule.cs → Modules/ProgrammableModules/FunctionModule/FunctionModule.cs
View File

@@ -8,7 +8,7 @@ using Nocturnis.Enigmos.Ports.DataPorts;
using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Modules.ProgrammableModules;
namespace Enigmos.Modules.ProgrammableModules.FunctionModule;
public partial class FunctionModule : ProgrammableModule, IPolymorphismModule
{
private IDataPortGroup[] ExteriorToInterior { get; set; } = Array.Empty<IDataPortGroup>();
@@ -34,7 +34,7 @@ public partial class FunctionModule : ProgrammableModule, IPolymorphismModule
private static readonly PackedScene FunctionModuleBoardScene = GlobalProvider.SceneProvider!
.AssetMapper<FunctionModuleBoard>();
public override BaseModule[] SubModules() =>
public override BaseModule[] SubModules =>
ExplicitDataInModules
.Union<BaseModule>(ExplicitDataOutModules)
.Union(ExplicitSignalInModules)

36
Modules/ProgrammableModules/OptimizationModule/OptimizationInputProviderModule.cs Normal file
View File

@@ -0,0 +1,36 @@
using Enigmos.Boards;
using Godot;
using Nocturnis.DataStructures;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Skeleton.DataStructure;
namespace Enigmos.Modules.ProgrammableModules.OptimizationModule;
public partial class OptimizationInputProviderModule : SubModule, IComputationalModule
{
public IDataOutPort[] DataOutPorts { get; set; } = Array.Empty<IDataOutPort>();
public override IEnumerable<IBasePort> Ports => DataOutPorts;
public IDataOutPort? Output { get; set; }
public OptimizationModuleBoard? ParentBoard { get; set; }
public void Init(OptimizationModuleBoard board)
{
base.Init();
ParentBoard = board;
this.DataOutInit("Output", 1);
Output = DataOutPorts[0];
PostInit();
}
public void Define()
{
(object, StringName) Func(CacheItem c)
{
IData w = ParentBoard!.OptimizationModule!.CachedInput[ParentBoard.OptimizationModule.ProcessingIndex];
return (w.Data, w.Type)!;
}
Output!.OutData.UpdateCalculation(Func);
}
}

78
Modules/ProgrammableModules/OptimizationModule.cs → Modules/ProgrammableModules/OptimizationModule/OptimizationModule.cs
View File

@@ -1,46 +1,47 @@
using Enigmos.Boards;
using Enigmos.Exceptions;
using Enigmos.Modules.ControllingModules;
using Enigmos.Modules.InterlayerModules;
using Enigmos.Ports;
using Enigmos.Ports.DataPorts;
using Godot;
using Nocturnis.DataStructures;
using Nocturnis.DataStructures.ConfigurableParameters;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Modules.ProgrammableModules;
namespace Enigmos.Modules.ProgrammableModules.OptimizationModule;
public partial class OptimizationModule : ProgrammableModule,
IPolymorphismModule,
IParameterizedModule,
public partial class OptimizationModule : ProgrammableModule,
IPolymorphismModule,
IParameterizedModule,
IOptimizationModule
{
private bool OptimizationEnded { get; set; }
public bool OptimizationFinished { get; set; }
public bool OptimizationStarted { get; set; }
private double? CachedOptimizeValue { get; set; }
public IDataInPort? InternalIterOut { get; set; }
public IDataOutPort? InternalArrayIn { get; set; }
public IDataInPort? ArrayInput { get; set; }
public IInterlayerDataInModule[] ExplicitOutputs { get; set; } = Array.Empty<IInterlayerDataInModule>();
public IInterlayerDataOutModule[] ImplicitInputs { get; set; } = Array.Empty<IInterlayerDataOutModule>();
public IData[] CachedInput { get; set; } = Array.Empty<IData>();
public int ProcessingIndex { get; set; }
private IBoolParameter? UsingMax { get; set; }
public IData CachedResult { get; set; } =
GlobalProvider.DataStructureProvider!.NewData(0, EnigmosConstant.DataPortTypes.Null);
private IData[] CachedInput { get; set; } = Array.Empty<IData>();
private int ProcessingIndex { get; set; }
private IBoolParameter? UsingMax { get; set; }
public IDataInPort? InternalIterOut { get; set; }
public IDataOutPort? InternalArrayIn { get; set; }
private IDataPortGroup[] InterlayerGroups { get; set; } = Array.Empty<IDataPortGroup>();
private IDataPortGroup? OptimizationGroup { get; set; }
private DataInPort? ArrayInput { get; set; }
private InterlayerDataInModule[] ExplicitInputs { get; set; } = Array.Empty<InterlayerDataInModule>();
private OptimizationItemOutputModule? ItemOut { get; set; }
private OptimizationValueOutputModule? ValueOut { get; set; }
private InterlayerDataInModule[] ExplicitInputs { get; set; } = Array.Empty<InterlayerDataInModule>();
private OptimizationSelectorModule? Selector { get; set; }
private OptimizationOutputModule? Output { get; set; }
public override IEnumerable<IBasePort> Ports => new[] { ArrayInput! };
public new OptimizationModuleBoard UnderlyingBoard
@@ -53,17 +54,17 @@ public partial class OptimizationModule : ProgrammableModule,
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
public override IEnumerable<IBasePort> ExplicitPorts =>
new IBasePort[] { ItemOut!.DataOut, ValueOut!.DataOut! }
new IBasePort[] { ArrayInput!, Output!.Output! }
.Union<IBasePort>(ExplicitInputs.Select(c => c.DataIn)!);
public override BaseModule[] SubModules() =>
public override BaseModule[] SubModules =>
ExplicitInputs
.Union(new BaseModule[] { ItemOut, ValueOut })
.Union(new BaseModule[] { Output! })
.ToArray();
public override IEnumerable<IBasePort> ImplicitPorts =>
new IBasePort[] { UnderlyingBoard.IterOut.Output, UnderlyingBoard.ValueIn.DataIn }
.Union(UnderlyingBoard.ImplicitDataOuts.Select(c => c.DataOut));
new IBasePort[] { UnderlyingBoard.InputProvider!.Output!, UnderlyingBoard.Selector!.Selector! }
.Union(UnderlyingBoard.ImplicitDataOuts.Select(c => c.DataOut))!;
public override void Init()
{
@@ -75,7 +76,8 @@ public partial class OptimizationModule : ProgrammableModule,
InterlayerGroups = new IDataPortGroup[3];
ExplicitInputs = new InterlayerDataInModule[3];
InternalIterOut = this.GetPort<IDataInPort>("InternalIterOut");
Output = GetModule<OptimizationOutputModule>("Output");
Output.Init();
for (int i = 0; i < 3; i++)
{
ExplicitInputs[i] = GetModule<InterlayerDataInModule>($"EI{i + 1}");
@@ -83,7 +85,7 @@ public partial class OptimizationModule : ProgrammableModule,
UnderlyingBoard.ImplicitDataOuts[i].DualModule = ExplicitInputs[i];
}
OptimizationEnded = true;
OptimizationFinished = true;
CachedInput = Array.Empty<IData>();
//CachedArray = Array.Empty<DataPackage>();
ProcessingIndex = 0;
@@ -91,9 +93,7 @@ public partial class OptimizationModule : ProgrammableModule,
CachedOptimizeValue = null;
ArrayInput = this.GetPort<DataInPort>("ArrayInput");
ItemOut = GetModule<OptimizationItemOutputModule>("ItemOut");
ValueOut = GetModule<OptimizationValueOutputModule>("ValueOut");
for (int i = 0; i < 3; i++)
{
InterlayerGroups[i] = GlobalProvider.DataStructureProvider.NewDataPortGroup(
@@ -119,8 +119,8 @@ public partial class OptimizationModule : ProgrammableModule,
"Min",
true
);
ItemOut.DataOut.SetDataType(EnigmosConstant.DataPortTypes.Real);
ValueOut.DataOut!.SetDataType(EnigmosConstant.DataPortTypes.Real);
Output.Output!.SetDataType(EnigmosConstant.DataPortTypes.Real);
Selector!.Selector!.SetDataType(EnigmosConstant.DataPortTypes.Real);
ConfigurableParameters = new HashSet<IConfigurableParameter> { UsingMax };
ConfigurablePortGroups =
InterlayerGroups.Union(new[] { OptimizationGroup }).ToHashSet();
@@ -132,31 +132,31 @@ public partial class OptimizationModule : ProgrammableModule,
public void Inference()
{
StringName elementType = GlobalProvider.DataPackageTypeProvider!.ToElement(OptimizationGroup!.SelectedType);
ItemOut!.DataOut.SetDataType(elementType);
UnderlyingBoard.IterOut!.Output!.SetDataType(elementType);
Output!.Output!.SetDataType(elementType);
UnderlyingBoard.InputProvider!.Output!.SetDataType(elementType);
}
private void SoftReset() => UnderlyingBoard.Reset();
public void Optimize()
{
if (OptimizationEnded)
if (OptimizationFinished)
{
CachedOptimizeValue = null;
CachedInput = InternalArrayIn!.OutData.Get!.Array;
CachedResult = GlobalProvider.DataStructureProvider.NewData(0, EnigmosConstant.DataPortTypes.Null);
CachedResult = GlobalProvider.DataStructureProvider!.NewData(0, EnigmosConstant.DataPortTypes.Null);
ProcessingIndex = 0;
}
while (ProcessingIndex < CachedInput.Length)
{
SoftReset();
UnderlyingBoard.IterOut!.Output!.OutData.UpdateCalculation(
UnderlyingBoard.InputProvider!.Output!.OutData.UpdateCalculation(
cache =>
(CachedInput[ProcessingIndex].Data, CachedInput[ProcessingIndex].Type)!
);
UnderlyingBoard.IterOut.Output.OutData.Expire();
double currentValue = UnderlyingBoard.ValueIn!.DataIn!.GetData.Get!.Double;
UnderlyingBoard.InputProvider.Output.OutData.Expire();
double currentValue = UnderlyingBoard.Selector!.Selector!.GetData.Get!.Double;
IData currentOut = InternalIterOut!.GetData.Get!;
if (UsingMax!.ParameterValue)
{
@@ -177,8 +177,8 @@ public partial class OptimizationModule : ProgrammableModule,
ProcessingIndex++;
}
ValueOut!.Define();
OptimizationEnded = true;
Output!.Define();
OptimizationFinished = true;
}
public bool Calculated { get; set; }

25
Modules/ProgrammableModules/OptimizationModule/OptimizationOutputModule.cs Normal file
View File

@@ -0,0 +1,25 @@
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
namespace Enigmos.Modules.ProgrammableModules.OptimizationModule;
public partial class OptimizationOutputModule : SubModule, IComputationalModule
{
public IDataOutPort? Output { get; set; }
public IDataOutPort[] DataOutPorts { get; set; } = Array.Empty<IDataOutPort>();
public override IEnumerable<IBasePort> Ports => DataOutPorts;
public override void Init()
{
this.DataOutInit("DataOut", 1);
Output = DataOutPorts[0];
}
public void Define()
{
throw new NotImplementedException();
}
}

14
Modules/ProgrammableModules/OptimizationModule/OptimizationSelectorModule.cs Normal file
View File

@@ -0,0 +1,14 @@
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
namespace Enigmos.Modules.ProgrammableModules.OptimizationModule;
public partial class OptimizationSelectorModule : SubModule
{
public IDataInPort? Selector { get; set; }
public override void Init()
{
base.Init();
Selector = this.GetPort<IDataInPort>("Selector");
}
}

4
Modules/ProgrammableModules/ProgrammableModule.cs
View File

@@ -9,7 +9,7 @@ namespace Enigmos.Modules.ProgrammableModules;
public abstract partial class ProgrammableModule : BaseModule, ICompositeModule, IProgrammableModule
{
public BaseBoard? UnderlyingBoard { get; set; }
public abstract IBaseModule[] SubModules();
public abstract IBaseModule[] SubModules { get; }
public void EnterProgrammableBoard() => GlobalProvider.SceneProvider!.RootScene.ChangeScene(UnderlyingBoard!);
public abstract IEnumerable<IBasePort> ExplicitPorts { get; }
public abstract IEnumerable<IBasePort> ImplicitPorts { get; }
@@ -24,7 +24,7 @@ public abstract partial class ProgrammableModule : BaseModule, ICompositeModule,
base.UpdateCables();
}
protected T GetModule<T>(string path) where T : BaseModule, IInterlayerModule
protected T GetModule<T>(string path) where T : SubModule
{
T res = GetNode<T>(path);
res.Init();