source generator
This commit is contained in:
@@ -19,17 +19,18 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
[Export] protected bool UsingPreset { get; set; }
|
||||
[Export] public IPresetModuleConnection[] PresetConnections { get; set; } = Array.Empty<IPresetModuleConnection>();
|
||||
[Export] public string LabelString { get; set; } = "";
|
||||
|
||||
|
||||
public virtual Vector2 PositionToBoard => Position;
|
||||
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)
|
||||
@@ -38,19 +39,18 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
port.Quality = PresetPortQuality;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public virtual void Init()
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
{
|
||||
foreach (IBasePort port in Ports)
|
||||
{
|
||||
if(!Board!.CablePairing.ContainsKey(port))
|
||||
if (!Board!.CablePairing.ContainsKey(port))
|
||||
continue;
|
||||
Board.CablePairing[port].LineUpdate();
|
||||
}
|
||||
@@ -80,7 +80,7 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
{
|
||||
foreach (IBasePort port in Ports)
|
||||
port.Module = this;
|
||||
if(UsingPreset)
|
||||
if (UsingPreset)
|
||||
PresetValueInit();
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ public abstract partial class BaseModule : TextureRect, IBaseModule
|
||||
}
|
||||
|
||||
protected virtual void TimeoutHandler(ModuleExecutionTimeout timeout) => throw timeout;
|
||||
|
||||
|
||||
public override Variant _GetDragData(Vector2 atPosition)
|
||||
{
|
||||
if (!Draggable)
|
||||
@@ -102,20 +102,12 @@ 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)
|
||||
{
|
||||
Vector2 mousePosition = GetLocalMousePosition();
|
||||
if(mousePosition.X > 0 && mousePosition.X < Size.X && mousePosition.Y > 0 && mousePosition.Y < Size.Y)
|
||||
if (mousePosition.X > 0 && mousePosition.X < Size.X && mousePosition.Y > 0 && mousePosition.Y < Size.Y)
|
||||
{
|
||||
if (eventMouseButton.ButtonIndex == MouseButton.Right && eventMouseButton.Pressed)
|
||||
{
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -13,8 +13,7 @@ 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();
|
||||
|
||||
@@ -4,9 +4,9 @@ using Nocturnis.Enigmos.Ports;
|
||||
|
||||
namespace Enigmos.Modules.ComputationalModules.Binary;
|
||||
|
||||
public abstract partial class BinaryLogicModule:BinaryComputationalModule,ILogicModule, IDuplicateOutputModule
|
||||
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()
|
||||
|
||||
@@ -15,8 +15,7 @@ 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; }
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
ComputationFinished = true;
|
||||
}
|
||||
|
||||
public bool Calculated { get; set; }
|
||||
}
|
||||
|
||||
|
||||
@@ -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