source generator
This commit is contained in:
@@ -1,11 +1,13 @@
|
||||
using Enigmos.Cables;
|
||||
using Enigmos.Modules;
|
||||
using Enigmos.Modules.ProgrammableModules;
|
||||
using Enigmos.Modules.SubModules;
|
||||
using Godot;
|
||||
using Nocturnis.DataStructures;
|
||||
using Nocturnis.Enigmos.Boards;
|
||||
using Nocturnis.Enigmos.Cables;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Modules.InterlayerModules;
|
||||
using Nocturnis.Enigmos.Ports;
|
||||
using Nocturnis.GlobalManagement.Controls;
|
||||
using Nocturnis.GlobalManagement.Providers;
|
||||
@@ -62,6 +64,17 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
|
||||
protected HashSet<IBasePort> Ports => Modules.SelectMany(module => module.Ports).ToHashSet();
|
||||
public IPanelViewer? PanelViewer { get; set; }
|
||||
public Dictionary<IBasePort, IBaseCable> CablePairing { get; set; } = new();
|
||||
|
||||
public IEnumerable<IBasePort> OnBoardPorts
|
||||
{
|
||||
get
|
||||
{
|
||||
IEnumerable<IBasePort> res = Array.Empty<IBasePort>();
|
||||
foreach (IInterlayerModule im in GetChildren().OfType<IInterlayerModule>())
|
||||
res = res.Union(im.Ports);
|
||||
return res;
|
||||
}
|
||||
}
|
||||
public IBasePort? ConnectPending { get; set; }
|
||||
public IBoardControlLayer? CircuitBoardControlLayer { get; set; }
|
||||
public IModuleMovingLayer? ModuleMovingLayer { get; set; }
|
||||
@@ -153,7 +166,7 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
|
||||
if (item is IBaseModuleItem moduleItem)
|
||||
{
|
||||
foreach (IBaseModule module in Modules)
|
||||
if (GlobalProvider.UIProvider.Overlap(atPosition, moduleItem.ContentModule.Size, module.Position, module.Size))
|
||||
if (GlobalProvider.UIProvider!.Overlap(atPosition, moduleItem.ContentModule.Size, module.Position, module.Size))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
@@ -198,4 +211,17 @@ public abstract partial class BaseBoard : Panel, IBaseBoard
|
||||
res.Board = this;
|
||||
return res;
|
||||
}
|
||||
|
||||
public T[] GetModules<T>() where T : BaseModule
|
||||
{
|
||||
T[] res = GetChildren().OfType<T>().OrderBy(x => x.Name).ToArray();
|
||||
foreach (T m in res)
|
||||
{
|
||||
m.Init();
|
||||
Modules.Add(m);
|
||||
m.Board = this;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
using Enigmos.Modules.InterlayerModules;
|
||||
using Enigmos.Modules.ProgrammableModules.FilterModule;
|
||||
using Nocturnis;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Modules.InterlayerModules;
|
||||
using Nocturnis.GlobalManagement.Constants;
|
||||
|
||||
namespace Enigmos.Boards;
|
||||
public partial class FilterModuleBoard : BaseBoard
|
||||
public partial class FilterModuleBoard : BaseBoard, ISceneConcept
|
||||
{
|
||||
public IFilterModule? FilterModule { get; set; }
|
||||
public FilterModule? FilterModule { get; set; }
|
||||
|
||||
public FilterInputProviderModule? InputProvider { get; set; }
|
||||
|
||||
@@ -19,7 +20,7 @@ public partial class FilterModuleBoard : BaseBoard
|
||||
//public IndicateInputModule? Indicate { get; set; }
|
||||
public FilterIndicateModule? Indicate { get; set; }
|
||||
|
||||
public void Init(IFilterModule filterModule)
|
||||
public void Init(FilterModule filterModule)
|
||||
{
|
||||
base.Init();
|
||||
FilterModule = filterModule;
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
using Enigmos.Modules.InterlayerModules;
|
||||
using Nocturnis;
|
||||
|
||||
namespace Enigmos.Boards;
|
||||
|
||||
public partial class FunctionModuleBoard : BaseBoard
|
||||
public partial class FunctionModuleBoard : BaseBoard, ISceneConcept
|
||||
{
|
||||
public InterlayerDataInModule[] DataIns { get; set; } = Array.Empty<InterlayerDataInModule>();
|
||||
public InterlayerDataOutModule[] DataOuts { get; set; } = Array.Empty<InterlayerDataOutModule>();
|
||||
|
||||
@@ -1,26 +1,28 @@
|
||||
using Enigmos.Modules.InterlayerModules;
|
||||
using Enigmos.Modules.Other;
|
||||
using Enigmos.Modules.ProgrammableModules.OptimizationModule;
|
||||
using Nocturnis.GlobalManagement.Constants;
|
||||
using Nocturnis;
|
||||
using Nocturnis.Attributes;
|
||||
|
||||
namespace Enigmos.Boards;
|
||||
|
||||
public partial class OptimizationModuleBoard : BaseBoard
|
||||
[UniqueInheritance]
|
||||
public partial class OptimizationModuleBoard : BaseBoard, ISceneConcept
|
||||
{
|
||||
public OptimizationModule? OptimizationModule { get; set; }
|
||||
|
||||
public OptimizationInputProviderModule? InputProvider { get; set; }
|
||||
public OptimizationSelectorModule? Selector { get; set; }
|
||||
public InterlayerDataOutModule[] ImplicitDataOuts { get; set; } = Array.Empty<InterlayerDataOutModule>();
|
||||
public override void Init()
|
||||
public void Init(OptimizationModule m)
|
||||
{
|
||||
|
||||
OptimizationModule = m;
|
||||
ImplicitDataOuts = new InterlayerDataOutModule[3];
|
||||
base.Init();
|
||||
for (int i = 0; i < 3; i++)
|
||||
ImplicitDataOuts[i] = GetModule<InterlayerDataOutModule>($"IO{i + 1}");
|
||||
InputProvider = GetModule<OptimizationInputProviderModule>("InputProvider");
|
||||
Selector = GetModule<OptimizationSelectorModule>("Selector");
|
||||
|
||||
InputProvider.Init(this);
|
||||
Selector.Init();
|
||||
}
|
||||
}
|
||||
|
||||
33
Cables/DataCable.cs
Normal file
33
Cables/DataCable.cs
Normal file
@@ -0,0 +1,33 @@
|
||||
using Godot;
|
||||
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
|
||||
|
||||
namespace Enigmos.Cables;
|
||||
|
||||
public partial class DataCable : BaseCable
|
||||
{
|
||||
public new IDataOutPort PortTo
|
||||
{
|
||||
get => (base.PortTo as IDataOutPort)!;
|
||||
set => base.PortTo = value;
|
||||
}
|
||||
|
||||
public new IDataInPort PortFrom
|
||||
{
|
||||
get => (base.PortFrom as IDataInPort)!;
|
||||
set => base.PortFrom = value;
|
||||
}
|
||||
|
||||
public override void LineUpdate()
|
||||
{
|
||||
Vector2 fromPosition = PortFrom.PositionToBoard;
|
||||
Vector2 toPosition = PortTo.PositionToBoard;
|
||||
Points = new[]
|
||||
{
|
||||
fromPosition,
|
||||
new Vector2((fromPosition.X + toPosition.X) / 2, fromPosition.Y),
|
||||
new Vector2((fromPosition.X + toPosition.X) / 2, toPosition.Y),
|
||||
toPosition
|
||||
};
|
||||
InFill.Points = Points;
|
||||
}
|
||||
}
|
||||
33
Cables/SignalCable.cs
Normal file
33
Cables/SignalCable.cs
Normal file
@@ -0,0 +1,33 @@
|
||||
using Enigmos.Ports.SignalPorts;
|
||||
using Godot;
|
||||
using Nocturnis.Enigmos.Ports.SignalPorts.Directions;
|
||||
|
||||
namespace Enigmos.Cables;
|
||||
|
||||
public partial class SignalCable : BaseCable
|
||||
{
|
||||
public new ISignalOutPort PortTo
|
||||
{
|
||||
get => (base.PortTo as ISignalOutPort)!;
|
||||
set => base.PortTo = value;
|
||||
}
|
||||
|
||||
public new ISignalInPort PortFrom
|
||||
{
|
||||
get => (base.PortFrom as ISignalInPort)!;
|
||||
set => base.PortFrom = value;
|
||||
}
|
||||
public override void LineUpdate()
|
||||
{
|
||||
Vector2 fromPosition = PortFrom.PositionToBoard;
|
||||
Vector2 toPosition = PortTo.PositionToBoard;
|
||||
Points = new []
|
||||
{
|
||||
fromPosition,
|
||||
new Vector2(fromPosition.X, (fromPosition.Y + toPosition.Y) / 2),
|
||||
new Vector2(toPosition.X, (fromPosition.Y + toPosition.Y) / 2),
|
||||
toPosition
|
||||
};
|
||||
InFill.Points = Points;
|
||||
}
|
||||
}
|
||||
@@ -16,4 +16,8 @@
|
||||
<ProjectReference Include="..\VirtualChemistry\VirtualChemistry.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Modules\InternalComputationalModule\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.Communicators;
|
||||
using Nocturnis.Enigmos.ModuleManuals;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
public partial class CommunicatorPairTab : Panel, IModuleManualTab
|
||||
public partial class CommunicatorPairTab : Panel, IModuleManualTab, ISceneConcept
|
||||
{
|
||||
private bool InitFlag { get; set; }
|
||||
public string FullName() => "Pair";
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.Enigmos.ModuleManuals;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class ErrorHandlerTab : Panel, IModuleManualTab
|
||||
public partial class ErrorHandlerTab : Panel, IModuleManualTab, ISceneConcept
|
||||
{
|
||||
public string FullName() => "Error Handling";
|
||||
private bool InitFlag { get; set; }
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.DataStructures.ConfigurableParameters;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class ModuleBoolValueParameterSetter : ModuleParameterSetter
|
||||
public partial class ModuleBoolValueParameterSetter : ModuleParameterSetter, ISceneConcept
|
||||
{
|
||||
private CheckButton ToggleSetter { get; set; }
|
||||
private Label TrueLabel { get; set; }
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.DataStructures.ConfigurableParameters;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class ModuleCharValueParameterSetter : ModuleParameterSetter
|
||||
public partial class ModuleCharValueParameterSetter : ModuleParameterSetter, ISceneConcept
|
||||
{
|
||||
private LineEdit CharInput { get; set; }
|
||||
private Button Apply { get; set; }
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.DataStructures.ConfigurableParameters;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class ModuleKeyValueParameterSetter : ModuleParameterSetter
|
||||
public partial class ModuleKeyValueParameterSetter : ModuleParameterSetter, ISceneConcept
|
||||
{
|
||||
public new IKeyParameter UnderlyingParameter
|
||||
{
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
using Enigmos.Modules.ProgrammableModules;
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.Enigmos.ModuleManuals;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.GlobalManagement.Providers;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class ModuleManual : Panel
|
||||
public abstract partial class ModuleManual : Panel, ISceneConcept
|
||||
{
|
||||
private bool InitFlag { get; set; }
|
||||
|
||||
@@ -16,15 +17,14 @@ public partial class ModuleManual : Panel
|
||||
InitFlag = true;
|
||||
}
|
||||
|
||||
private Label ModuleDescriptionTitle { get; set; }
|
||||
private RichTextLabel ModuleDescription { get; set; }
|
||||
private Label ModuleConfigurationTitle { get; set; }
|
||||
private TextureButton Close { get; set; }
|
||||
private TabContainer ConfigurationTabs { get; set; }
|
||||
private IBaseModule Module { get; set; }
|
||||
private List<IModuleManualTab> Tabs { get; set; }
|
||||
private LineEdit LabelString { get; set; }
|
||||
|
||||
private Label? ModuleDescriptionTitle { get; set; }
|
||||
private RichTextLabel? ModuleDescription { get; set; }
|
||||
private Label? ModuleConfigurationTitle { get; set; }
|
||||
private TextureButton? Close { get; set; }
|
||||
private TabContainer? ConfigurationTabs { get; set; }
|
||||
private IBaseModule? Module { get; set; }
|
||||
private List<IModuleManualTab> Tabs { get; set; } = new();
|
||||
private LineEdit? LabelString { get; set; }
|
||||
public override void _Ready()
|
||||
{
|
||||
if(!InitFlag)
|
||||
@@ -38,16 +38,16 @@ public partial class ModuleManual : Panel
|
||||
LabelString = GetNode<LineEdit>("LabelString");
|
||||
LabelString.Text = Module.LabelString;
|
||||
Tabs = new List<IModuleManualTab>();
|
||||
PortMaintenanceTab mainTab = GlobalProvider.SceneProvider
|
||||
.AssetMapper<PortMaintenanceTab>()
|
||||
PortMaintenanceTab mainTab = GlobalProvider
|
||||
.AssetMapper<PortMaintenanceTab>.Scene
|
||||
.Instantiate<PortMaintenanceTab>();
|
||||
mainTab.Init(Module);
|
||||
Tabs.Add(mainTab);
|
||||
ConfigurationTabs.AddChild(mainTab);
|
||||
if (Module is IPolymorphismModule polyModule)
|
||||
{
|
||||
ModulePolymorphismTab polyTab = GlobalProvider.SceneProvider
|
||||
.AssetMapper<ModulePolymorphismTab>()
|
||||
ModulePolymorphismTab polyTab = GlobalProvider
|
||||
.AssetMapper<ModulePolymorphismTab>.Scene
|
||||
.Instantiate<ModulePolymorphismTab>();
|
||||
polyTab.Init(polyModule);
|
||||
Tabs.Add(polyTab);
|
||||
@@ -56,8 +56,8 @@ public partial class ModuleManual : Panel
|
||||
|
||||
if (Module is IParameterizedModule paraModule)
|
||||
{
|
||||
ModuleParameterTab paraTab = GlobalProvider.SceneProvider
|
||||
.AssetMapper<ModuleParameterTab>()
|
||||
ModuleParameterTab paraTab = GlobalProvider
|
||||
.AssetMapper<ModuleParameterTab>.Scene
|
||||
.Instantiate<ModuleParameterTab>();
|
||||
paraTab.Init(paraModule);
|
||||
Tabs.Add(paraTab);
|
||||
@@ -66,8 +66,8 @@ public partial class ModuleManual : Panel
|
||||
|
||||
if (Module is ICommunicateModule comModule)
|
||||
{
|
||||
CommunicatorPairTab pairTab = GlobalProvider.SceneProvider
|
||||
.AssetMapper<CommunicatorPairTab>()
|
||||
CommunicatorPairTab pairTab = GlobalProvider
|
||||
.AssetMapper<CommunicatorPairTab>.Scene
|
||||
.Instantiate<CommunicatorPairTab>();
|
||||
pairTab.Init(comModule);
|
||||
Tabs.Add(pairTab);
|
||||
@@ -76,8 +76,8 @@ public partial class ModuleManual : Panel
|
||||
|
||||
if (Module is ProgrammableModule programmableModule)
|
||||
{
|
||||
ProgrammableModuleSettingTab progTab =GlobalProvider.SceneProvider
|
||||
.AssetMapper<ProgrammableModuleSettingTab>()
|
||||
ProgrammableModuleSettingTab progTab =GlobalProvider
|
||||
.AssetMapper<ProgrammableModuleSettingTab>.Scene
|
||||
.Instantiate<ProgrammableModuleSettingTab>();
|
||||
progTab.Init(programmableModule);
|
||||
Tabs.Add(progTab);
|
||||
@@ -86,8 +86,8 @@ public partial class ModuleManual : Panel
|
||||
|
||||
if (Module is IErrorHandlerModule errorHandlerModule)
|
||||
{
|
||||
ErrorHandlerTab errTab = GlobalProvider.SceneProvider
|
||||
.AssetMapper<ErrorHandlerTab>()
|
||||
ErrorHandlerTab errTab = GlobalProvider
|
||||
.AssetMapper<ErrorHandlerTab>.Scene
|
||||
.Instantiate<ErrorHandlerTab>();
|
||||
errTab.Init(errorHandlerModule);
|
||||
Tabs.Add(errTab);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.DataStructures.ConfigurableParameters;
|
||||
using Nocturnis.Enigmos.ModuleManuals;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
@@ -6,7 +7,7 @@ using Nocturnis.GlobalManagement.Providers;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class ModuleParameterTab : Panel, IModuleManualTab
|
||||
public partial class ModuleParameterTab : Panel, IModuleManualTab, ISceneConcept
|
||||
{
|
||||
public string FullName() => "Parameter";
|
||||
private bool InitFlag { get; set; }
|
||||
@@ -18,11 +19,7 @@ public partial class ModuleParameterTab : Panel, IModuleManualTab
|
||||
|
||||
public IParameterizedModule Module { get; set; }
|
||||
|
||||
private static readonly PackedScene RealParameterSetterScene =
|
||||
GlobalProvider.SceneProvider.AssetMapper<ModuleRealValueParameterSetter>();
|
||||
|
||||
private static readonly PackedScene BoolParameterSetterScene =
|
||||
GlobalProvider.SceneProvider.AssetMapper<ModuleBoolValueParameterSetter>();
|
||||
private VBoxContainer Parameters { get; set; }
|
||||
public override void _Ready()
|
||||
{
|
||||
@@ -33,24 +30,26 @@ public partial class ModuleParameterTab : Panel, IModuleManualTab
|
||||
{
|
||||
if(parameter is IDoubleParameter doubleParameter)
|
||||
{
|
||||
ModuleRealValueParameterSetter setter =
|
||||
RealParameterSetterScene.Instantiate<ModuleRealValueParameterSetter>();
|
||||
ModuleRealValueParameterSetter setter = GlobalProvider
|
||||
.AssetMapper<ModuleRealValueParameterSetter>.Scene
|
||||
.Instantiate<ModuleRealValueParameterSetter>();
|
||||
setter.Init(doubleParameter);
|
||||
Parameters.AddChild(setter);
|
||||
}
|
||||
|
||||
else if (parameter is IBoolParameter boolParameter)
|
||||
{
|
||||
ModuleBoolValueParameterSetter setter =
|
||||
BoolParameterSetterScene.Instantiate<ModuleBoolValueParameterSetter>();
|
||||
ModuleBoolValueParameterSetter setter = GlobalProvider
|
||||
.AssetMapper<ModuleBoolValueParameterSetter>.Scene
|
||||
.Instantiate<ModuleBoolValueParameterSetter>();
|
||||
setter.Init(boolParameter);
|
||||
Parameters.AddChild(setter);
|
||||
}
|
||||
else if (parameter is ICharParameter charParameter)
|
||||
{
|
||||
ModuleCharValueParameterSetter setter =
|
||||
GlobalProvider.SceneProvider
|
||||
.AssetMapper<ModuleCharValueParameterSetter>()
|
||||
GlobalProvider
|
||||
.AssetMapper<ModuleCharValueParameterSetter>.Scene
|
||||
.Instantiate<ModuleCharValueParameterSetter>();
|
||||
setter.Init(charParameter);
|
||||
Parameters.AddChild(setter);
|
||||
@@ -58,8 +57,8 @@ public partial class ModuleParameterTab : Panel, IModuleManualTab
|
||||
else if (parameter is IKeyParameter keyParameter)
|
||||
{
|
||||
ModuleKeyValueParameterSetter setter =
|
||||
GlobalProvider.SceneProvider
|
||||
.AssetMapper<ModuleKeyValueParameterSetter>()
|
||||
GlobalProvider
|
||||
.AssetMapper<ModuleKeyValueParameterSetter>.Scene
|
||||
.Instantiate<ModuleKeyValueParameterSetter>();
|
||||
setter.Init(keyParameter);
|
||||
Parameters.AddChild(setter);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.DataStructures.DataPortGroups;
|
||||
using Nocturnis.Enigmos.ModuleManuals;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
@@ -6,7 +7,7 @@ using Nocturnis.GlobalManagement.Providers;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class ModulePolymorphismTab : Panel, IModuleManualTab
|
||||
public partial class ModulePolymorphismTab : Panel, IModuleManualTab, ISceneConcept
|
||||
{
|
||||
private bool InitFlag { get; set; }
|
||||
|
||||
@@ -17,9 +18,6 @@ public partial class ModulePolymorphismTab : Panel, IModuleManualTab
|
||||
}
|
||||
|
||||
public string FullName() => "Polymorphism";
|
||||
|
||||
private static readonly PackedScene PortTypeSelectorScene =
|
||||
GlobalProvider.SceneProvider.AssetMapper<PortTypeSelector>();
|
||||
public IPolymorphismModule Module { get; set; }
|
||||
private VBoxContainer PortGroups { get; set; }
|
||||
|
||||
@@ -30,7 +28,9 @@ public partial class ModulePolymorphismTab : Panel, IModuleManualTab
|
||||
PortGroups = GetNode<VBoxContainer>("ScrolledItems/PortGroups");
|
||||
foreach (IDataPortGroup group in Module.ConfigurablePortGroups)
|
||||
{
|
||||
PortTypeSelector selector = PortTypeSelectorScene.Instantiate<PortTypeSelector>();
|
||||
PortTypeSelector selector = GlobalProvider
|
||||
.AssetMapper<PortTypeSelector>.Scene
|
||||
.Instantiate<PortTypeSelector>();
|
||||
selector.Init(group);
|
||||
PortGroups.AddChild(selector);
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.DataStructures.ConfigurableParameters;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class ModuleRealValueParameterSetter : ModuleParameterSetter
|
||||
public partial class ModuleRealValueParameterSetter : ModuleParameterSetter, ISceneConcept
|
||||
{
|
||||
public void Init(IDoubleParameter parameter)
|
||||
{
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using Enigmos.Modules.ProgrammableModules;
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.Enigmos.ModuleManuals;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Ports;
|
||||
@@ -7,7 +8,7 @@ using Nocturnis.GlobalManagement.Providers;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class PortMaintenanceTab : Panel, IModuleManualTab
|
||||
public abstract partial class PortMaintenanceTab : Panel, IModuleManualTab, ISceneConcept
|
||||
{
|
||||
private bool InitFlag { get; set; }
|
||||
|
||||
@@ -18,7 +19,10 @@ public partial class PortMaintenanceTab : Panel, IModuleManualTab
|
||||
}
|
||||
|
||||
public string FullName() => "Maintenance";
|
||||
private static readonly PackedScene PortFixerScene = GlobalProvider.SceneProvider!.AssetMapper<PortFixer>();
|
||||
|
||||
protected abstract PortFixer PortFixerInstantiate();
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Should Be Assigned Before This Tab Been Added As Child To Tab Container
|
||||
/// </summary>
|
||||
@@ -31,7 +35,7 @@ public partial class PortMaintenanceTab : Panel, IModuleManualTab
|
||||
Ports = GetNode<VBoxContainer>("ScrolledItems/Ports");
|
||||
foreach (IBasePort port in Module!.Ports)
|
||||
{
|
||||
PortFixer fixer = PortFixerScene.Instantiate<PortFixer>();
|
||||
PortFixer fixer = PortFixerInstantiate();
|
||||
fixer.Init(port);
|
||||
Ports.AddChild(fixer);
|
||||
}
|
||||
@@ -39,18 +43,18 @@ public partial class PortMaintenanceTab : Panel, IModuleManualTab
|
||||
if (Module is ProgrammableModule programmableModule)
|
||||
{
|
||||
HashSet<string> used = new HashSet<string>();
|
||||
foreach (IBasePort port in programmableModule.ExplicitPorts)
|
||||
foreach (IBasePort port in programmableModule.Ports)
|
||||
{
|
||||
int i = 0;
|
||||
while (used.Contains("Exterior" + port.Name + $"#{i}"))
|
||||
i++;
|
||||
used.Add("Exterior" + port.Name + $"#{i}");
|
||||
port.Name = "Exterior" + port.Name + $"#{i}";
|
||||
PortFixer fixer = PortFixerScene.Instantiate<PortFixer>();
|
||||
PortFixer fixer = PortFixerInstantiate();
|
||||
fixer.Init(port);
|
||||
Ports.AddChild(fixer);
|
||||
}
|
||||
foreach (IBasePort port in programmableModule.ImplicitPorts)
|
||||
foreach (IBasePort port in programmableModule.Board!.OnBoardPorts)
|
||||
{
|
||||
string baseName = port.Name.ToString().Replace("Empty", "Interior");
|
||||
int i = 0;
|
||||
@@ -58,7 +62,7 @@ public partial class PortMaintenanceTab : Panel, IModuleManualTab
|
||||
i++;
|
||||
used.Add(baseName + $"#{i}");
|
||||
port.Name = baseName + $"#{i}";
|
||||
PortFixer fixer = PortFixerScene.Instantiate<PortFixer>();
|
||||
PortFixer fixer = PortFixerInstantiate();
|
||||
fixer.Init(port);
|
||||
Ports.AddChild(fixer);
|
||||
}
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.DataStructures.DataPortGroups;
|
||||
using Nocturnis.GlobalManagement.Providers;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class PortTypeSelector : Control
|
||||
public partial class PortTypeSelector : Control, ISceneConcept
|
||||
{
|
||||
private bool InitFlag { get; set; }
|
||||
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
using Enigmos.Modules.ProgrammableModules;
|
||||
using Godot;
|
||||
using Nocturnis;
|
||||
using Nocturnis.Enigmos.ModuleManuals;
|
||||
using Nocturnis.GlobalManagement.Providers;
|
||||
|
||||
namespace Enigmos.Manual;
|
||||
|
||||
public partial class ProgrammableModuleSettingTab : Panel, IModuleManualTab
|
||||
public abstract partial class ProgrammableModuleSettingTab : Panel, IModuleManualTab, ISceneConcept
|
||||
{
|
||||
private ProgrammableModule? Module { get; set; }
|
||||
|
||||
@@ -29,4 +30,5 @@ public partial class ProgrammableModuleSettingTab : Panel, IModuleManualTab
|
||||
{
|
||||
GlobalProvider.SceneProvider!.RootScene.ChangeScene(Module!.UnderlyingBoard);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -24,12 +24,13 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
protected virtual bool Draggable => true;
|
||||
protected virtual bool HasManual => true;
|
||||
public bool HasLabel => HasManual;
|
||||
public virtual IEnumerable<IBasePort> Ports => Array.Empty<BasePort>();
|
||||
public virtual IEnumerable<IBasePort> Ports => GetChildren().OfType<IBasePort>();
|
||||
|
||||
public IBaseBoard? Board { get; set; }
|
||||
private ModuleManual? Manual { get; set; }
|
||||
public ISimpleLabel? Label { get; set; }
|
||||
public Label? Label { get; set; }
|
||||
public Node AsNode => this;
|
||||
|
||||
public virtual void PresetValueInit()
|
||||
{
|
||||
foreach (IBasePort port in Ports)
|
||||
@@ -45,12 +46,11 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
{
|
||||
if (HasLabel)
|
||||
{
|
||||
Label = GlobalProvider.SceneProvider!
|
||||
.AssetMapper<ISimpleLabel>()
|
||||
.Instantiate<ISimpleLabel>();
|
||||
Label = new Label();
|
||||
Label.AddThemeFontOverride("font", GlobalProvider.Font);
|
||||
Label.Position = new Vector2(0, -25);
|
||||
Label.Text = LabelString;
|
||||
AddChild(Label.AsNode);
|
||||
AddChild(Label);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,14 +102,6 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
return GlobalProvider.DataStructureProvider!.NewVariantWithType("Module", this);
|
||||
}
|
||||
|
||||
|
||||
/*protected T GetPort<T>(string path) where T : BasePort
|
||||
{
|
||||
T res = GetNode<T>(path);
|
||||
res.Init();
|
||||
return res;
|
||||
}*/
|
||||
|
||||
public override void _Input(InputEvent @event)
|
||||
{
|
||||
if (@event is InputEventMouseButton eventMouseButton)
|
||||
@@ -125,8 +117,8 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
return;
|
||||
if (Manual == null)
|
||||
{
|
||||
Manual = GlobalProvider.SceneProvider!
|
||||
.AssetMapper<ModuleManual>()
|
||||
Manual = GlobalProvider
|
||||
.AssetMapper<ModuleManual>.Scene
|
||||
.Instantiate<ModuleManual>();
|
||||
Manual.Init(this);
|
||||
}
|
||||
@@ -148,7 +140,8 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
.Select(p => Board.CablePairing[p])
|
||||
.ToHashSet();
|
||||
if (this is ICompositeModule thisCompositeModule)
|
||||
foreach (IBasePort port in thisCompositeModule.SubModules.SelectMany(module => module.Ports).Where(Board.CablePairing.ContainsKey))
|
||||
foreach (IBasePort port in thisCompositeModule.SubModules.SelectMany(module => module.Ports)
|
||||
.Where(Board.CablePairing.ContainsKey))
|
||||
Board.FocusedCables.Add(Board.CablePairing[port]);
|
||||
foreach (IBaseCable cable in Board.FocusedCables)
|
||||
cable.Modulate = Color.Color8(255, 255, 255, 255);
|
||||
@@ -159,4 +152,7 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
|
||||
base._Input(@event);
|
||||
}
|
||||
|
||||
public Texture2D PreviewTexture => GlobalProvider.TextureProvider.ModuleTextureMapper(this);
|
||||
|
||||
}
|
||||
|
||||
41
Modules/CompositeModule.cs
Normal file
41
Modules/CompositeModule.cs
Normal file
@@ -0,0 +1,41 @@
|
||||
using Enigmos.Modules.SubModules;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Ports;
|
||||
|
||||
namespace Enigmos.Modules;
|
||||
|
||||
public partial class CompositeModule : BaseModule, ICompositeModule
|
||||
{
|
||||
public IBaseModule[] SubModules => GetChildren().OfType<IBaseModule>().ToArray();
|
||||
|
||||
public override IEnumerable<IBasePort> Ports
|
||||
{
|
||||
get
|
||||
{
|
||||
IEnumerable<IBasePort> res = base.Ports;
|
||||
foreach (IBaseModule bm in SubModules)
|
||||
res = res.Union(bm.Ports);
|
||||
return res;
|
||||
}
|
||||
}
|
||||
protected T GetModule<T>(string path) where T : SubModule
|
||||
{
|
||||
T res = GetNode<T>(path);
|
||||
res.Init();
|
||||
res.ParentModule = this;
|
||||
res.Board = Board;
|
||||
return res;
|
||||
}
|
||||
|
||||
protected T[] GetModules<T>() where T : SubModule
|
||||
{
|
||||
T[] res = SubModules.OfType<T>().OrderBy(x => x.Name).ToArray();
|
||||
foreach (T m in res)
|
||||
{
|
||||
m.Init();
|
||||
m.ParentModule = this;
|
||||
m.Board = Board;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
@@ -14,7 +14,6 @@ public partial class AdditionModule : BinaryComputationalModule, IPolymorphismMo
|
||||
private IDataInGroup? InputGroup { get; set; }
|
||||
private IDataOutGroup? OutputGroup { get; set; }
|
||||
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public override double MaintenanceAlpha => 0.19572021d;
|
||||
public override double MaintenanceBeta => 0.20151779d;
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
|
||||
@@ -6,7 +6,7 @@ namespace Enigmos.Modules.ComputationalModules.Binary;
|
||||
|
||||
public abstract partial class BinaryLogicModule : BinaryComputationalModule, ILogicModule, IDuplicateOutputModule
|
||||
{
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -13,7 +13,6 @@ public partial class ComparisionModule : BinaryComputationalModule,
|
||||
IOperationModule
|
||||
{
|
||||
private IBoolParameter? Greater { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public HashSet<IConfigurableParameter> ConfigurableParameters { get; set; } = new();
|
||||
|
||||
public override void Init()
|
||||
|
||||
@@ -14,7 +14,6 @@ public partial class ControlledOutputModule : BinaryComputationalModule, IPolymo
|
||||
[Export] private StringName? PresetDataType { get; set; }
|
||||
private IDataOutGroup? OutputGroup { get; set; }
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public void Inference() => DataInPorts[1].SetDataType(OutputGroup!.SelectedType);
|
||||
public override void Init()
|
||||
{
|
||||
|
||||
@@ -15,7 +15,6 @@ public partial class DivisionModule : BinaryComputationalModule,
|
||||
{
|
||||
private IDataInGroup? InputGroup { get; set; }
|
||||
private IDataOutGroup? OutputGroup { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
|
||||
public override void Init()
|
||||
|
||||
@@ -13,8 +13,6 @@ public partial class DotProductModule : BinaryComputationalModule, IPolymorphism
|
||||
{
|
||||
private IDataInGroup? VectorInputGroup { get; set; }
|
||||
private IDataOutGroup? OutputGroup { get; set; }
|
||||
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
|
||||
public override void Init()
|
||||
|
||||
@@ -8,7 +8,6 @@ namespace Enigmos.Modules.ComputationalModules.Binary;
|
||||
|
||||
public partial class MaxModule : BinaryComputationalModule, IOperationModule, IDuplicateOutputModule
|
||||
{
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -8,7 +8,6 @@ namespace Enigmos.Modules.ComputationalModules.Binary;
|
||||
|
||||
public partial class MinModule : BinaryComputationalModule, IDuplicateOutputModule, IOperationModule
|
||||
{
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -13,8 +13,6 @@ public partial class MultiplicationModule : BinaryComputationalModule, IPolymorp
|
||||
{
|
||||
private IDataPortGroup? InputGroup { get; set; }
|
||||
private IDataPortGroup? OutputGroup { get; set; }
|
||||
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
|
||||
public override void Init()
|
||||
|
||||
@@ -14,7 +14,6 @@ public partial class PowerModule : BinaryComputationalModule, IPolymorphismModul
|
||||
{
|
||||
private IDataPortGroup? TensorInputGroup { get; set; }
|
||||
private IDataPortGroup? OutputGroup { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
|
||||
public override void Init()
|
||||
|
||||
@@ -17,7 +17,6 @@ public partial class ScalarDivisionModule : BinaryComputationalModule,
|
||||
private IDataPortGroup? ScalarInputGroup { get; set; }
|
||||
private IDataPortGroup? TensorInputGroup { get; set; }
|
||||
private IDataPortGroup? OutputGroup { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public override double MaintenanceAlpha => 0.77852142d;
|
||||
public override double MaintenanceBeta => 0.9544432d;
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
|
||||
@@ -18,7 +18,6 @@ public partial class ScalarMultiplicationModule :
|
||||
private IDataPortGroup? ScalarInputGroup { get; set; }
|
||||
private IDataPortGroup? TensorInputGroup { get; set; }
|
||||
private IDataPortGroup? OutputGroup { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
|
||||
public override void Init()
|
||||
|
||||
@@ -15,8 +15,6 @@ public partial class SubtractionModule : BinaryComputationalModule,
|
||||
{
|
||||
private IDataPortGroup? InputGroup { get; set; }
|
||||
private IDataPortGroup? OutputGroup { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
|
||||
public override void Init()
|
||||
|
||||
@@ -19,11 +19,7 @@ public partial class V2Module : BinaryComputationalModule,
|
||||
{
|
||||
private IDataPortGroup? ScalarInputGroup { get; set; }
|
||||
private IDataPortGroup? OutputGroup { get; set; }
|
||||
private DataOutPort? Output1 { get; set; }
|
||||
private DataOutPort? Output2 { get; set; }
|
||||
private DataOutPort? Output3 { get; set; }
|
||||
private DataOutPort? Output4 { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
|
||||
public override double MaintenanceAlpha => 0.77852142d;
|
||||
public override double MaintenanceBeta => 0.9544432d;
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
|
||||
@@ -6,9 +6,7 @@ namespace Enigmos.Modules.ComputationalModules;
|
||||
|
||||
public abstract partial class BinaryComputationalModule : ComputationalModule, IBinaryComputationalModule
|
||||
{
|
||||
public override IEnumerable<IBasePort> Ports => DataInPorts;
|
||||
public IDataInPort[] DataInPorts { get; set; } = new IDataInPort[2];
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -12,7 +12,6 @@ public partial class ConstantModule : NullaryComputationalModule, IParameterized
|
||||
{
|
||||
|
||||
[Export] private double PresetConstantValue { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
private IDoubleParameter? ConstValue { get; set; }
|
||||
public override void Init()
|
||||
{
|
||||
|
||||
@@ -21,7 +21,6 @@ public partial class KeyListenerModule : NullaryComputationalModule,
|
||||
public IKeyParameter? ListeningKey { get; set; }
|
||||
public bool Pressed { get; set; }
|
||||
public HashSet<IConfigurableParameter> ConfigurableParameters { get; set; } = new();
|
||||
public override IEnumerable<BasePort> Ports => new[] { Output1, Output2, Output3 }!;
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -20,7 +20,6 @@ public partial class NormalDistributionModule : NullaryComputationalModule,
|
||||
private DataOutPort? Output2 { get; set; }
|
||||
private DataOutPort? Output3 { get; set; }
|
||||
private DataOutPort? Output4 { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
private IDoubleParameter? Mu { get; set; }
|
||||
private IDoubleParameter? Sigma { get; set; }
|
||||
|
||||
|
||||
@@ -6,5 +6,5 @@ namespace Enigmos.Modules.ComputationalModules;
|
||||
|
||||
public abstract partial class NullaryComputationalModule : ComputationalModule, ISourceModule
|
||||
{
|
||||
public override IEnumerable<IBasePort> Ports => Array.Empty<BasePort>();
|
||||
|
||||
}
|
||||
@@ -17,7 +17,6 @@ public partial class SelectorModule : TernaryComputationalModule,
|
||||
{
|
||||
private IDataPortGroup? DataTypeGroup { get; set; }
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -7,7 +7,6 @@ namespace Enigmos.Modules.ComputationalModules;
|
||||
public abstract partial class TernaryComputationalModule : ComputationalModule, IParameterModule
|
||||
{
|
||||
public IDataInPort[] DataInPorts { get; set; } = new IDataInPort[3];
|
||||
public override IEnumerable<IBasePort> Ports => DataInPorts;
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -14,7 +14,6 @@ public partial class CopyModule : UnaryComputationalModule,
|
||||
{
|
||||
private IDataPortGroup? InputGroup { get; set; }
|
||||
private IDataPortGroup? OutputGroup { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
public override void Init()
|
||||
{
|
||||
|
||||
@@ -8,7 +8,6 @@ namespace Enigmos.Modules.ComputationalModules.Unary;
|
||||
|
||||
public partial class LogicalNegationModule : UnaryComputationalModule, IDuplicateOutputModule
|
||||
{
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -12,13 +12,9 @@ namespace Enigmos.Modules.ComputationalModules.Unary;
|
||||
|
||||
public partial class NegationModule : UnaryComputationalModule, IPolymorphismModule, IDuplicateOutputModule
|
||||
{
|
||||
private DataOutPort? Output1 { get; set; }
|
||||
private DataOutPort? Output2 { get; set; }
|
||||
private DataOutPort? Output3 { get; set; }
|
||||
private DataOutPort? Output4 { get; set; }
|
||||
|
||||
private IDataInGroup? InputGroup { get; set; }
|
||||
private IDataOutGroup? OutputGroup { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts)!;
|
||||
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
public override void Init()
|
||||
|
||||
@@ -13,7 +13,6 @@ public partial class SquareModule : UnaryComputationalModule, IPolymorphismModul
|
||||
{
|
||||
private IDataPortGroup? InputGroup { get; set; }
|
||||
private IDataPortGroup? OutputGroup { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
public override void Init()
|
||||
|
||||
@@ -16,7 +16,6 @@ public partial class V2ComponentModule : UnaryComputationalModule, IPolymorphism
|
||||
private IDataPortGroup? VectorInputGroup { get; set; }
|
||||
private IDataPortGroup? ScalarOutputGroup { get; set; }
|
||||
|
||||
public override IEnumerable<IBasePort> Ports => base.Ports.Union(DataOutPorts);
|
||||
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
|
||||
|
||||
public override void Init()
|
||||
|
||||
@@ -8,7 +8,6 @@ namespace Enigmos.Modules.ComputationalModules;
|
||||
public abstract partial class UnaryComputationalModule : ComputationalModule, IUnaryComputationalModule
|
||||
{
|
||||
public IDataInPort[] DataInPorts { get; set; } = new IDataInPort[1];
|
||||
public override IEnumerable<IBasePort> Ports => DataInPorts;
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -15,7 +15,7 @@ public partial class AttackActionModule : ActionModule, ITerminalModule
|
||||
_ = ip.GetData.Get;
|
||||
}
|
||||
|
||||
public override IEnumerable<IBasePort> Ports => SignalInPorts.Union(DataInPorts.Cast<IBasePort>()).ToArray();
|
||||
public bool Finished { get; set; }
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
|
||||
@@ -18,7 +18,7 @@ public partial class MoveActionModule : ActionModule, ITerminalModule
|
||||
_ = ip.GetData.Get;
|
||||
}
|
||||
|
||||
public override IEnumerable<IBasePort> Ports => DataInPorts.Union(SignalInPorts.Cast<IBasePort>());
|
||||
public bool Finished { get; set; }
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
|
||||
@@ -16,7 +16,6 @@ public partial class RootModule : BaseModule, IRootModule
|
||||
|
||||
protected override bool Draggable => false;
|
||||
public ISignalOutPort[] SignalOutPorts { get; set; } = Array.Empty<ISignalOutPort>();
|
||||
public override IEnumerable<IBasePort> Ports => SignalOutPorts;
|
||||
public Stopwatch? Timer { get; set; }
|
||||
public bool Visited { get; set; }
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ public partial class SinglePoleDoubleThrowSwitchModule : PiplineModule, IParamet
|
||||
{
|
||||
public HashSet<IConfigurableParameter> ConfigurableParameters { get; set; } = new();
|
||||
private IBoolParameter? LeftPortForTrue { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports =>
|
||||
SignalInPorts.Union(SignalOutPorts.Cast<IBasePort>()).Union(DataInPorts).ToArray();
|
||||
public IDataInPort[] DataInPorts { get; set; } = Array.Empty<IDataInPort>();
|
||||
public void Drain()
|
||||
{
|
||||
@@ -22,6 +20,8 @@ public partial class SinglePoleDoubleThrowSwitchModule : PiplineModule, IParamet
|
||||
_ = ip.GetData.Get;
|
||||
}
|
||||
|
||||
public bool Finished { get; set; }
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -8,8 +8,6 @@ namespace Enigmos.Modules.ControllingModules;
|
||||
|
||||
public partial class SinglePoleSingleThrowSwitchModule : PiplineModule, ITerminalModule
|
||||
{
|
||||
public override IEnumerable<IBasePort> Ports =>
|
||||
SignalInPorts.Union(SignalOutPorts.Cast<IBasePort>()).Union(DataInPorts);
|
||||
public IDataInPort[] DataInPorts { get; set; } = Array.Empty<IDataInPort>();
|
||||
|
||||
public void Drain()
|
||||
@@ -19,6 +17,8 @@ public partial class SinglePoleSingleThrowSwitchModule : PiplineModule, ITermina
|
||||
|
||||
}
|
||||
|
||||
public bool Finished { get; set; }
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using Enigmos.Modules.SubModules;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Modules.InterlayerModules;
|
||||
using Nocturnis.Enigmos.Ports;
|
||||
@@ -15,7 +16,6 @@ public partial class InterlayerDataInModule : SubModule, IInterlayerDataInModule
|
||||
}
|
||||
public IInterlayerDataOutModule? DualModule { get; set; }
|
||||
public IDataInPort? DataIn { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => new[] { DataIn }!;
|
||||
public IDataInPort[] DataInPorts { get; set; } = Array.Empty<IDataInPort>();
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using Enigmos.Modules.ComputationalModules;
|
||||
using Enigmos.Modules.SubModules;
|
||||
using Godot;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Modules.ComputationalModules;
|
||||
@@ -20,7 +21,7 @@ public partial class InterlayerDataOutModule : SubModule, IComputationalModule,
|
||||
public IBasePort UnderlyingPort => DataOut!;
|
||||
public IInterlayerDataInModule? DualModule { get; set; }
|
||||
public IDataOutPort? DataOut { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => new[] { DataOut }!;
|
||||
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using Enigmos.Modules.SubModules;
|
||||
using Godot;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Modules.InterlayerModules;
|
||||
@@ -16,7 +17,6 @@ public partial class InterlayerSignalInModule : SubModule, IInterlayerSignalInMo
|
||||
public IBasePort UnderlyingPort => SignalIn!;
|
||||
public IInterlayerSignalOutModule? DualModule { get; set; }
|
||||
public ISignalInPort? SignalIn { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => new[] { SignalIn }!;
|
||||
public ISignalInPort[] SignalInPorts { get; set; } = Array.Empty<ISignalInPort>();
|
||||
|
||||
public override void Init()
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using Enigmos.Modules.SubModules;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Modules.InterlayerModules;
|
||||
using Nocturnis.Enigmos.Ports;
|
||||
@@ -15,7 +16,6 @@ public partial class InterlayerSignalOutModule : SubModule, IInterlayerSignalOut
|
||||
public IBasePort UnderlyingPort => SignalOut!;
|
||||
public IInterlayerSignalInModule? DualModule { get; set; }
|
||||
public ISignalOutPort? SignalOut { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => new[] { SignalOut }!;
|
||||
|
||||
public ISignalOutPort[] SignalOutPorts { get; set; } = Array.Empty<ISignalOutPort>();
|
||||
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
using Enigmos.Modules.ComputationalModules;
|
||||
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;
|
||||
|
||||
namespace Enigmos.Modules.Other;
|
||||
|
||||
public partial class OutputSubModule : NullaryComputationalModule
|
||||
{
|
||||
public override Vector2 PositionToBoard =>
|
||||
base.PositionToBoard + (ParentModule?.PositionToBoard ?? Vector2.Zero);
|
||||
protected override bool Draggable => false;
|
||||
protected override bool HasManual => false;
|
||||
public override IEnumerable<IBasePort> Ports => new[] { DataOut };
|
||||
public IComputationalCompositeModule? ParentModule { get; set; }
|
||||
public IDataOutPort? DataOut { get; set; }
|
||||
|
||||
public override void Define()
|
||||
{
|
||||
//DataOut = ParentModule
|
||||
}
|
||||
|
||||
//protected override void Compute(IRootModule root) => ParentModule.Compute(root);
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
this.DataOutInit("DataOut", 1);
|
||||
DataOut = DataOutPorts[0];
|
||||
DataOut.SetDataType(EnigmosConstant.DataPortTypes.Real);
|
||||
PostInit();
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
using Enigmos.Modules.SubModules;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
|
||||
|
||||
|
||||
@@ -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; }
|
||||
|
||||
@@ -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; }
|
||||
@@ -34,17 +38,13 @@ public partial class FilterModule : ProgrammableModule, IPolymorphismModule, IFi
|
||||
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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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++)
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
public bool Calculated { get; set; }
|
||||
ComputationFinished = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
using Enigmos.Modules.SubModules;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
|
||||
|
||||
|
||||
@@ -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++)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
32
Modules/SubModules/EnumerableArrayInputModule.cs
Normal file
32
Modules/SubModules/EnumerableArrayInputModule.cs
Normal file
@@ -0,0 +1,32 @@
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
|
||||
|
||||
namespace Enigmos.Modules.SubModules;
|
||||
|
||||
public partial class EnumerableArrayInputModule : SubModule, ITerminalModule
|
||||
{
|
||||
public new IEnumerableProcessingModule ParentModule
|
||||
{
|
||||
get => (base.ParentModule as IEnumerableProcessingModule)!;
|
||||
set => base.ParentModule = value;
|
||||
}
|
||||
public IDataInPort? Input { get; set; }
|
||||
public IDataInPort[] DataInPorts { get; set; } = Array.Empty<IDataInPort>();
|
||||
public void Init(IEnumerableProcessingModule module)
|
||||
{
|
||||
base.Init();
|
||||
this.DataInInit("Input", 1);
|
||||
Input = DataInPorts[0];
|
||||
ParentModule = module;
|
||||
}
|
||||
|
||||
public void Drain()
|
||||
{
|
||||
if(Finished)
|
||||
return;
|
||||
ParentModule.CachedInputArray = Input!.GetData.Get!.Array;
|
||||
}
|
||||
|
||||
public bool Finished { get; set; }
|
||||
}
|
||||
|
||||
9
Modules/SubModules/EnumerableElementOutputModule.cs
Normal file
9
Modules/SubModules/EnumerableElementOutputModule.cs
Normal file
@@ -0,0 +1,9 @@
|
||||
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
|
||||
|
||||
namespace Enigmos.Modules.SubModules;
|
||||
|
||||
public partial class EnumerableElementOutputModule : SubModule
|
||||
{
|
||||
private IDataOutPort? Output { get; set; }
|
||||
|
||||
}
|
||||
35
Modules/SubModules/OutputSubModule.cs
Normal file
35
Modules/SubModules/OutputSubModule.cs
Normal file
@@ -0,0 +1,35 @@
|
||||
using Godot;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
|
||||
using Skeleton.DataStructure;
|
||||
|
||||
namespace Enigmos.Modules.SubModules;
|
||||
|
||||
public partial class OutputSubModule : SubModule, ISourceModule
|
||||
{
|
||||
public IDataOutPort? Out { get; set; }
|
||||
public IDataOutPort[] DataOutPorts { get; set; } = Array.Empty<IDataOutPort>();
|
||||
|
||||
public new IInternalComputationalModule? ParentModule
|
||||
{
|
||||
get => base.ParentModule as IInternalComputationalModule;
|
||||
set => base.ParentModule = value;
|
||||
}
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
Out = this.GetPort<IDataOutPort>("Out");
|
||||
}
|
||||
|
||||
public void Define()
|
||||
{
|
||||
(object, StringName) Func(CacheItem c)
|
||||
{
|
||||
if (!ParentModule!.ComputationFinished)
|
||||
ParentModule!.Compute();
|
||||
return (ParentModule!.CachedResult.Data, ParentModule!.CachedResult.Type)!;
|
||||
}
|
||||
Out!.OutData.UpdateCalculation(Func);
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
using Godot;
|
||||
using Nocturnis.Enigmos.Modules;
|
||||
|
||||
namespace Enigmos.Modules;
|
||||
namespace Enigmos.Modules.SubModules;
|
||||
|
||||
public class SubModule : BaseModule
|
||||
{
|
||||
public IBaseModule? ParentModule { get; set; }
|
||||
public ICompositeModule? ParentModule { get; set; }
|
||||
public sealed override Vector2 PositionToBoard =>
|
||||
base.PositionToBoard + (ParentModule?.PositionToBoard ?? Vector2.Zero);
|
||||
protected sealed override bool Draggable => false;
|
||||
@@ -18,7 +18,6 @@ public partial class MemoryModule : BaseModule, ITerminalModule, ISourceModule,
|
||||
|
||||
public IDataInPort[] DataInPorts { get; set; } = Array.Empty<IDataInPort>();
|
||||
public IDataOutPort[] DataOutPorts { get; set; } = Array.Empty<IDataOutPort>();
|
||||
public override IEnumerable<IBasePort> Ports => DataInPorts.Union<IBasePort>(DataOutPorts);
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
@@ -67,4 +66,5 @@ public partial class MemoryModule : BaseModule, ITerminalModule, ISourceModule,
|
||||
|
||||
}
|
||||
|
||||
public bool Finished { get; set; }
|
||||
}
|
||||
@@ -14,7 +14,6 @@ public partial class SRLatchModule : BaseModule,
|
||||
{
|
||||
public IDataOutPort[] DataOutPorts { get; set; } = Array.Empty<IDataOutPort>();
|
||||
public IDataInPort[] DataInPorts { get; set; } = Array.Empty<IDataInPort>();
|
||||
public override IEnumerable<IBasePort> Ports => DataInPorts.Union<IBasePort>(DataOutPorts);
|
||||
|
||||
private bool State { get; set; }
|
||||
|
||||
@@ -29,6 +28,9 @@ public partial class SRLatchModule : BaseModule,
|
||||
else if (reset)
|
||||
State = false;
|
||||
}
|
||||
|
||||
public bool Finished { get; set; }
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -12,7 +12,6 @@ public partial class LightEmittingDiodeModule : TerminalModule
|
||||
{
|
||||
private Sprite2D? LightEmittingDiode { get; set; }
|
||||
private IDataInPort? Input { get; set; }
|
||||
public override IEnumerable<IBasePort> Ports => new[] { Input! };
|
||||
|
||||
private static readonly Texture2D TrueTexture =
|
||||
ResourceLoader.Load<Texture2D>("res://Resources/Circuits/Modules/Terminal/Testing/LEDBubble-T.png");
|
||||
|
||||
@@ -11,8 +11,6 @@ public partial class R2ReaderModule : TerminalModule
|
||||
private DataInPort? DataIn { get; set; }
|
||||
private R2Reader? R2Reader { get; set; }
|
||||
|
||||
public override IEnumerable<BasePort> Ports => new[] { DataIn! };
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
|
||||
@@ -12,7 +12,6 @@ public partial class RealReaderModule : BaseModule, ITerminalModule, IOperationM
|
||||
{
|
||||
private AnimatedSprite2D? RealReader { get; set; }
|
||||
public IDataInPort[] DataInPorts { get; set; } = Array.Empty<IDataInPort>();
|
||||
public override IEnumerable<IBasePort> Ports => DataInPorts;
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
@@ -35,4 +34,6 @@ public partial class RealReaderModule : BaseModule, ITerminalModule, IOperationM
|
||||
int frame = Mathf.FloorToInt(percentage * 122);
|
||||
RealReader!.SpeedScale = (frame - RealReader.Frame) / 60f;
|
||||
}
|
||||
|
||||
public bool Finished { get; set; }
|
||||
}
|
||||
Reference in New Issue
Block a user