source generator

This commit is contained in:
h z
2024-07-10 07:02:11 +01:00
parent 3eec8a1345
commit 401e48e0ba
77 changed files with 432 additions and 336 deletions

View File

@@ -1,3 +1,4 @@
using Enigmos.Modules.SubModules;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;

View File

@@ -1,4 +1,5 @@
using Enigmos.Boards;
using Enigmos.Modules.SubModules;
using Godot;
using Nocturnis.DataStructures;
using Nocturnis.Enigmos.Modules.ComputationalModules;
@@ -11,7 +12,6 @@ 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; }

View File

@@ -1,5 +1,6 @@
using Enigmos.Boards;
using Enigmos.Modules.InterlayerModules;
using Enigmos.Modules.SubModules;
using Nocturnis.DataStructures;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.Enigmos.Modules;
@@ -12,18 +13,21 @@ using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Modules.ProgrammableModules.FilterModule;
public partial class FilterModule : ProgrammableModule, IPolymorphismModule, IFilterModule
public partial class FilterModule : ProgrammableModule,
IPolymorphismModule,
IInternalComputationalModule,
IEnumerableProcessingModule
{
public IDataInPort? InputArray { get; set; }
public FilterOutputModule? OutputArrayModule { get; set; }
public OutputSubModule? OutputArrayModule { get; set; }
private IInterlayerDataInModule[] ExplicitInputs { get; set; } = Array.Empty<IInterlayerDataInModule>();
private IDataPortGroup[] InterLayerGroups { get; set; } = Array.Empty<IDataPortGroup>();
private IDataPortGroup? ArrayGroup { get; set; }
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; }
public IData? CachedResult { get; set; }
public bool ComputationFinished { get; set; }
public bool ComputationStarted { get; set; }
private List<IData> CachedListResult { get; set; } = new();
public int ProcessingIndex { get; set; }
@@ -33,18 +37,14 @@ public partial class FilterModule : ProgrammableModule, IPolymorphismModule, IFi
get => (base.UnderlyingBoard as FilterModuleBoard)!;
set => base.UnderlyingBoard = value;
}
public override IEnumerable<IBasePort> Ports => new IBasePort[] { InputArray!, OutputArrayModule!.Output! };
public override IBaseModule[] SubModules => ExplicitInputs;
public override IEnumerable<IBasePort> ExplicitPorts =>
new IBasePort[] { InputArray!, OutputArrayModule!.Output! }
new IBasePort[] { InputArray!, OutputArrayModule!.Out! }
.Union(ExplicitInputs.Select(c => c.DataIn))!
.ToArray<IBasePort>();
public override IEnumerable<IBasePort> ImplicitPorts =>
new IBasePort[] { OutputArrayModule!.Output!, InputArray! }
new IBasePort[] { OutputArrayModule!.Out!, InputArray! }
.Union(UnderlyingBoard.FilterInputProxy.Select(c => c.DataOut))
.ToArray()!;
@@ -54,14 +54,14 @@ public partial class FilterModule : ProgrammableModule, IPolymorphismModule, IFi
{
}
public void Filter()
public void Compute()
{
if (!FilterStarted)
if (!ComputationStarted)
{
CachedInputArray = InputArray!.GetData.Get!.Array;
ProcessingIndex = 0;
CachedListResult = new List<IData>();
FilterStarted = true;
ComputationStarted = true;
}
while (ProcessingIndex < CachedInputArray.Length)
@@ -74,9 +74,10 @@ public partial class FilterModule : ProgrammableModule, IPolymorphismModule, IFi
ProcessingIndex += 1;
}
CachedResult = CachedListResult.ToArray();
FilterFinished = true;
FilterStarted = false;
CachedResult.Data = CachedListResult.ToArray();
//TODO CachedResult.Type
ComputationFinished = true;
ComputationStarted = false;
}
@@ -86,18 +87,18 @@ public partial class FilterModule : ProgrammableModule, IPolymorphismModule, IFi
{
base.Init();
InputArray = this.GetPort<IDataInPort>("InputArray");
OutputArrayModule = GetModule<FilterOutputModule>("OutputArray");
UnderlyingBoard = GlobalProvider.SceneProvider!
.AssetMapper<FilterModuleBoard>()
OutputArrayModule = GetModule<OutputSubModule>("OutputArray");
UnderlyingBoard = GlobalProvider
.AssetMapper<FilterModuleBoard>.Scene
.Instantiate<FilterModuleBoard>();
ExplicitInputs = new IInterlayerDataInModule[3];
for (int i = 0; i < 3; i++)
ExplicitInputs[i] = GetModule<InterlayerDataInModule>($"EI{i + 1}");
OutputArrayModule.Init(this);
OutputArrayModule.Init();
UnderlyingBoard.Init(this);
FilterFinished = false;
FilterStarted = false;
ComputationFinished = false;
ComputationStarted = false;
for (int i = 0; i < 3; i++)
{
@@ -113,7 +114,7 @@ public partial class FilterModule : ProgrammableModule, IPolymorphismModule, IFi
ArrayGroup = GlobalProvider.DataStructureProvider!.NewDataPortGroup(
this,
new IDataPort[] { InputArray, OutputArrayModule.Output! },
new IDataPort[] { InputArray, OutputArrayModule.Out! },
"Array Type",
EnigmosConstant.DataPortTypes.RealArray,
EnigmosConstant.DataPortTypes.AnyArray

View File

@@ -1,41 +0,0 @@
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);
}
}

View File

@@ -3,6 +3,7 @@ using Enigmos.Modules.InterlayerModules;
using Godot;
using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts;
using Nocturnis.GlobalManagement.Constants;
@@ -31,20 +32,11 @@ public partial class FunctionModule : ProgrammableModule, IPolymorphismModule
.Union(UnderlyingBoard.SignalOuts.SelectMany(module => module.Ports));
private static readonly PackedScene FunctionModuleBoardScene = GlobalProvider.SceneProvider!
.AssetMapper<FunctionModuleBoard>();
public override BaseModule[] SubModules =>
ExplicitDataInModules
.Union<BaseModule>(ExplicitDataOutModules)
.Union(ExplicitSignalInModules)
.Union(ExplicitSignalOutModules)
.ToArray();
private InterlayerDataInModule[] ExplicitDataInModules { get; set; } = Array.Empty<InterlayerDataInModule>();
private InterlayerDataOutModule[] ExplicitDataOutModules { get; set; } = Array.Empty<InterlayerDataOutModule>();
private InterlayerSignalInModule[] ExplicitSignalInModules { get; set; } = Array.Empty<InterlayerSignalInModule>();
private InterlayerSignalOutModule[] ExplicitSignalOutModules { get; set; } =
Array.Empty<InterlayerSignalOutModule>();
@@ -56,14 +48,28 @@ public partial class FunctionModule : ProgrammableModule, IPolymorphismModule
public override void Init()
{
UnderlyingBoard = FunctionModuleBoardScene.Instantiate<FunctionModuleBoard>();
UnderlyingBoard = GlobalProvider
.AssetMapper<FunctionModuleBoard>.Scene
.Instantiate<FunctionModuleBoard>();
UnderlyingBoard.Init();
ExteriorToInterior = new IDataPortGroup[4];
InteriorToExterior = new IDataPortGroup[4];
ExplicitDataInModules = new InterlayerDataInModule[4];
ExplicitDataOutModules = new InterlayerDataOutModule[4];
ExplicitSignalInModules = new InterlayerSignalInModule[4];
ExplicitSignalOutModules = new InterlayerSignalOutModule[4];
ExplicitDataInModules = GetChildren()
.OfType<InterlayerDataInModule>()
.OrderBy(x => x.AsNode.Name)
.ToArray();
ExplicitDataOutModules = GetChildren()
.OfType<InterlayerDataOutModule>()
.OrderBy(x => x.AsNode.Name)
.ToArray();
ExplicitSignalInModules = GetChildren()
.OfType<InterlayerSignalInModule>()
.OrderBy(x => x.AsNode.Name)
.ToArray();
ExplicitSignalOutModules = GetChildren()
.OfType<InterlayerSignalOutModule>()
.OrderBy(x => x.AsNode.Name)
.ToArray();
for (int i = 0; i < 4; i++)
{

View File

@@ -1,4 +1,5 @@
using Enigmos.Boards;
using Enigmos.Modules.SubModules;
using Godot;
using Nocturnis.DataStructures;
using Nocturnis.Enigmos.Modules.ComputationalModules;
@@ -11,7 +12,6 @@ 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; }
@@ -28,7 +28,7 @@ public partial class OptimizationInputProviderModule : SubModule, IComputational
{
(object, StringName) Func(CacheItem c)
{
IData w = ParentBoard!.OptimizationModule!.CachedInput[ParentBoard.OptimizationModule.ProcessingIndex];
IData w = ParentBoard!.OptimizationModule!.CachedInputArray[ParentBoard.OptimizationModule.ProcessingIndex];
return (w.Data, w.Type)!;
}
Output!.OutData.UpdateCalculation(Func);

View File

@@ -1,12 +1,12 @@
using Enigmos.Boards;
using Enigmos.Modules.InterlayerModules;
using Enigmos.Modules.SubModules;
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;
@@ -18,15 +18,14 @@ namespace Enigmos.Modules.ProgrammableModules.OptimizationModule;
public partial class OptimizationModule : ProgrammableModule,
IPolymorphismModule,
IParameterizedModule,
IOptimizationModule
IInternalComputationalModule,
IEnumerableProcessingModule
{
public bool OptimizationFinished { get; set; }
public bool OptimizationStarted { get; set; }
public bool ComputationFinished { get; set; }
public bool ComputationStarted { get; set; }
private double? CachedOptimizeValue { 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 IData[] CachedInputArray { get; set; } = Array.Empty<IData>();
public int ProcessingIndex { get; set; }
private IBoolParameter? UsingMax { get; set; }
public IData CachedResult { get; set; } =
@@ -41,8 +40,8 @@ public partial class OptimizationModule : ProgrammableModule,
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! };
private OutputSubModule? Output { get; set; }
public new OptimizationModuleBoard UnderlyingBoard
{
@@ -54,14 +53,9 @@ public partial class OptimizationModule : ProgrammableModule,
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
public override IEnumerable<IBasePort> ExplicitPorts =>
new IBasePort[] { ArrayInput!, Output!.Output! }
new IBasePort[] { ArrayInput!, Output!.Out! }
.Union<IBasePort>(ExplicitInputs.Select(c => c.DataIn)!);
public override BaseModule[] SubModules =>
ExplicitInputs
.Union(new BaseModule[] { Output! })
.ToArray();
public override IEnumerable<IBasePort> ImplicitPorts =>
new IBasePort[] { UnderlyingBoard.InputProvider!.Output!, UnderlyingBoard.Selector!.Selector! }
.Union(UnderlyingBoard.ImplicitDataOuts.Select(c => c.DataOut))!;
@@ -69,14 +63,14 @@ public partial class OptimizationModule : ProgrammableModule,
public override void Init()
{
base.Init();
UnderlyingBoard = GlobalProvider.SceneProvider!
.AssetMapper<OptimizationModuleBoard>()
UnderlyingBoard = GlobalProvider
.AssetMapper<OptimizationModuleBoard>.Scene
.Instantiate<OptimizationModuleBoard>();
UnderlyingBoard.Init();
InterlayerGroups = new IDataPortGroup[3];
ExplicitInputs = new InterlayerDataInModule[3];
InternalIterOut = this.GetPort<IDataInPort>("InternalIterOut");
Output = GetModule<OptimizationOutputModule>("Output");
Output = GetModule<OutputSubModule>("Output");
Output.Init();
for (int i = 0; i < 3; i++)
{
@@ -85,8 +79,8 @@ public partial class OptimizationModule : ProgrammableModule,
UnderlyingBoard.ImplicitDataOuts[i].DualModule = ExplicitInputs[i];
}
OptimizationFinished = true;
CachedInput = Array.Empty<IData>();
ComputationFinished = true;
CachedInputArray = Array.Empty<IData>();
//CachedArray = Array.Empty<DataPackage>();
ProcessingIndex = 0;
CachedResult = GlobalProvider.DataStructureProvider!.NullData;
@@ -119,7 +113,7 @@ public partial class OptimizationModule : ProgrammableModule,
"Min",
true
);
Output.Output!.SetDataType(EnigmosConstant.DataPortTypes.Real);
Output.Out!.SetDataType(EnigmosConstant.DataPortTypes.Real);
Selector!.Selector!.SetDataType(EnigmosConstant.DataPortTypes.Real);
ConfigurableParameters = new HashSet<IConfigurableParameter> { UsingMax };
ConfigurablePortGroups =
@@ -132,28 +126,28 @@ public partial class OptimizationModule : ProgrammableModule,
public void Inference()
{
StringName elementType = GlobalProvider.DataPackageTypeProvider!.ToElement(OptimizationGroup!.SelectedType);
Output!.Output!.SetDataType(elementType);
Output!.Out!.SetDataType(elementType);
UnderlyingBoard.InputProvider!.Output!.SetDataType(elementType);
}
private void SoftReset() => UnderlyingBoard.Reset();
public void Optimize()
public void Compute()
{
if (OptimizationFinished)
if (ComputationFinished)
{
CachedOptimizeValue = null;
CachedInput = InternalArrayIn!.OutData.Get!.Array;
CachedInputArray = InternalArrayIn!.OutData.Get!.Array;
CachedResult = GlobalProvider.DataStructureProvider!.NewData(0, EnigmosConstant.DataPortTypes.Null);
ProcessingIndex = 0;
}
while (ProcessingIndex < CachedInput.Length)
while (ProcessingIndex < CachedInputArray.Length)
{
SoftReset();
UnderlyingBoard.InputProvider!.Output!.OutData.UpdateCalculation(
cache =>
(CachedInput[ProcessingIndex].Data, CachedInput[ProcessingIndex].Type)!
(CachedInputArray[ProcessingIndex].Data, CachedInputArray[ProcessingIndex].Type)!
);
UnderlyingBoard.InputProvider.Output.OutData.Expire();
double currentValue = UnderlyingBoard.Selector!.Selector!.GetData.Get!.Double;
@@ -178,9 +172,7 @@ public partial class OptimizationModule : ProgrammableModule,
}
Output!.Define();
OptimizationFinished = true;
ComputationFinished = true;
}
public bool Calculated { get; set; }
}

View File

@@ -1,25 +0,0 @@
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();
}
}

View File

@@ -1,3 +1,4 @@
using Enigmos.Modules.SubModules;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;

View File

@@ -1,15 +1,15 @@
using Enigmos.Boards;
using Enigmos.Modules.InterlayerModules;
using Enigmos.Modules.SubModules;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Modules.ProgrammableModules;
public abstract partial class ProgrammableModule : BaseModule, ICompositeModule, IProgrammableModule
public abstract partial class ProgrammableModule : CompositeModule, IProgrammableModule
{
public BaseBoard? UnderlyingBoard { get; set; }
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,12 +24,18 @@ public abstract partial class ProgrammableModule : BaseModule, ICompositeModule,
base.UpdateCables();
}
protected T GetModule<T>(string path) where T : SubModule
public override void Init()
{
T res = GetNode<T>(path);
res.Init();
res.ParentModule = this;
res.Board = Board;
return res;
base.Init();
InterlayerDataInModule[] explicitDataInModules = GetModules<InterlayerDataInModule>();
InterlayerDataOutModule[] explicitDataOutModules = GetModules<InterlayerDataOutModule>();
InterlayerSignalInModule[] explicitSignalInModules = GetModules<InterlayerSignalInModule>();
InterlayerSignalOutModule[] explicitSignalOutModules = GetModules<InterlayerSignalOutModule>();
for (int i = 0; i <= explicitDataInModules.Length; i++)
{
}
}
}