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

Data Type

Browse Source
This commit is contained in:
h z
2024-07-11 11:21:29 +01:00
parent a8688d7f95
commit bd5ab1e940
62 changed files with 233 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Boards/BaseBoard.cs
View File

@@ -1,7 +1,6 @@
using Enigmos.Cables; using Enigmos.Cables;
using Enigmos.Modules; using Enigmos.Modules;
using Enigmos.Modules.ProgrammableModules; using Enigmos.Modules.ProgrammableModules;
using Enigmos.Modules.SubModules;
using Godot; using Godot;
using Nocturnis.DataStructures; using Nocturnis.DataStructures;
using Nocturnis.Enigmos.Boards; using Nocturnis.Enigmos.Boards;

3
Boards/FilterModuleBoard.cs
View File

@@ -1,7 +1,6 @@
using Enigmos.Modules.InterlayerModules; using Enigmos.Modules.InterlayerModules;
using Enigmos.Modules.ProgrammableModules.FilterModule; using Enigmos.Modules.ProgrammableModules.FilterModule;
using Nocturnis; using Nocturnis;
using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.InterlayerModules; using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
@@ -32,7 +31,7 @@ public partial class FilterModuleBoard : BaseBoard, ISceneConcept
base.Init(); base.Init();
//IterativeOutput = GetModule<XIterativeOutputModule>("IterativeOutput"); //IterativeOutput = GetModule<XIterativeOutputModule>("IterativeOutput");
Indicate = GetModule<FilterIndicateModule>("Indicate"); Indicate = GetModule<FilterIndicateModule>("Indicate");
Indicate.Indicate!.SetDataType(EnigmosConstant.DataPortTypes.Bit); Indicate.Indicate!.SetDataType(DataTypeConstant.BaseDataTypes.Bit);
} }
} }

1
Cables/SignalCable.cs
View File

@@ -1,4 +1,3 @@
using Enigmos.Ports.SignalPorts;
using Godot; using Godot;
using Nocturnis.Enigmos.Ports.SignalPorts.Directions; using Nocturnis.Enigmos.Ports.SignalPorts.Directions;

1
Manual/PortMaintenanceTab.cs
View File

@@ -4,7 +4,6 @@ using Nocturnis;
using Nocturnis.Enigmos.ModuleManuals; using Nocturnis.Enigmos.ModuleManuals;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports; using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Manual; namespace Enigmos.Manual;

2
Modules/BaseModule.cs
View File

@@ -1,6 +1,5 @@
using Enigmos.Exceptions; using Enigmos.Exceptions;
using Enigmos.Manual; using Enigmos.Manual;
using Enigmos.Ports;
using Godot; using Godot;
using Nocturnis.DataStructures; using Nocturnis.DataStructures;
using Nocturnis.Enigmos.Boards; using Nocturnis.Enigmos.Boards;
@@ -8,7 +7,6 @@ using Nocturnis.Enigmos.Cables;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports; using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Nocturnis.UIElements;
namespace Enigmos.Modules; namespace Enigmos.Modules;

14
Modules/ComputationalModules/Binary/AdditionModule.cs
View File

@@ -1,8 +1,8 @@
using Godot; using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -27,15 +27,15 @@ public abstract partial class AdditionModule : BinaryComputationalModule, IPolym
this, this,
DataInPorts, DataInPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.TensorTypes
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider!.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"Output Port Type", "Output Port Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyTensor DataTypeConstant.DataTypeOptions.TensorTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup };
PostInit(); PostInit();
@@ -46,7 +46,7 @@ public abstract partial class AdditionModule : BinaryComputationalModule, IPolym
public override string GetDescription => GlobalProvider.EnigmosProvider!.ModuleDescription<AdditionModule>(); public override string GetDescription => GlobalProvider.EnigmosProvider!.ModuleDescription<AdditionModule>();
public override void Define() public override void Define()
{ {
(object, StringName) Proxy(CacheItem cache) => (object, DataType) Proxy(CacheItem cache) =>
GlobalProvider.PolymorphismProvider!.Add(this.X(cache), this.Y(cache)); GlobalProvider.PolymorphismProvider!.Add(this.X(cache), this.Y(cache));
this.Define(Proxy); this.Define(Proxy);
} }

1
Modules/ComputationalModules/Binary/BinaryLogicModule.cs
View File

@@ -1,6 +1,5 @@
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
namespace Enigmos.Modules.ComputationalModules.Binary; namespace Enigmos.Modules.ComputationalModules.Binary;

9
Modules/ComputationalModules/Binary/ComparisionModule.cs
View File

@@ -1,7 +1,6 @@
using Nocturnis.DataStructures.ConfigurableParameters; using Nocturnis.DataStructures.ConfigurableParameters;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
@@ -19,8 +18,8 @@ public abstract partial class ComparisionModule : BinaryComputationalModule,
{ {
base.Init(); base.Init();
this.DataOutInit("Output",1); this.DataOutInit("Output",1);
this.SetInputType(EnigmosConstant.DataPortTypes.Real); this.SetInputType(DataTypeConstant.BaseDataTypes.Real);
this.SetOutputType(EnigmosConstant.DataPortTypes.Real); this.SetOutputType(DataTypeConstant.BaseDataTypes.Real);
Greater = GlobalProvider.DataStructureProvider!.NewBoolParameter("Method", "gt", "lt", true); Greater = GlobalProvider.DataStructureProvider!.NewBoolParameter("Method", "gt", "lt", true);
ConfigurableParameters = new HashSet<IConfigurableParameter>() { Greater }; ConfigurableParameters = new HashSet<IConfigurableParameter>() { Greater };
PostInit(); PostInit();
@@ -31,8 +30,8 @@ public abstract partial class ComparisionModule : BinaryComputationalModule,
{ {
this.Define( this.Define(
cache => ( cache => (
!(Greater!.ParameterValue ^ (this.X(cache).Double > this.Y(cache).Double)), !(Greater!.ParameterValue ^ (this.X(cache).Real > this.Y(cache).Real)),
EnigmosConstant.DataPortTypes.Bit DataTypeConstant.BaseDataTypes.Bit
) )
); );
} }

14
Modules/ComputationalModules/Binary/ControlledOutputModule.cs
View File

@@ -1,8 +1,8 @@
using Godot; using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -23,22 +23,22 @@ public abstract partial class ControlledOutputModule : BinaryComputationalModule
this, this,
DataOutPorts, DataOutPorts,
"Output Data Type", "Output Data Type",
UsingPreset ? PresetDataType! : EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyType DataTypeConstant.DataTypeOptions.AnyType
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup };
DataInPorts[0].SetDataType(EnigmosConstant.DataPortTypes.Bit); DataInPorts[0].SetDataType(DataTypeConstant.BaseDataTypes.Bit);
DataInPorts[1].SetDataType(EnigmosConstant.DataPortTypes.Real); DataInPorts[1].SetDataType(DataTypeConstant.BaseDataTypes.Real);
PostInit(); PostInit();
} }
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) (object, DataType) Func(CacheItem cache)
{ {
if (this.X(cache).Bit) if (this.X(cache).Bit)
return (this.Y(cache).Data!, this.Y(cache).Type!); return (this.Y(cache).Data!, this.Y(cache).Type!);
return (0, EnigmosConstant.DataPortTypes.Null); return (0, DataTypeConstant.BaseDataTypes.Null);
} }
this.Define(Func); this.Define(Func);

12
Modules/ComputationalModules/Binary/DivisionModule.cs
View File

@@ -1,8 +1,8 @@
using Godot; using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -25,15 +25,15 @@ public abstract partial class DivisionModule : BinaryComputationalModule,
this, this,
DataInPorts, DataInPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.ScalarTypes
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"Output Port Type", "Output Port Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.NumericTypes DataTypeConstant.DataTypeOptions.ScalarTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup };
PostInit(); PostInit();
@@ -41,7 +41,7 @@ public abstract partial class DivisionModule : BinaryComputationalModule,
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => (object, DataType) Func(CacheItem cache) =>
GlobalProvider.PolymorphismProvider!.Div(this.X(cache), this.Y(cache)); GlobalProvider.PolymorphismProvider!.Div(this.X(cache), this.Y(cache));
this.Define(Func); this.Define(Func);
} }

16
Modules/ComputationalModules/Binary/DotProductModule.cs
View File

@@ -1,8 +1,8 @@
using Godot; using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -23,15 +23,15 @@ public abstract partial class DotProductModule : BinaryComputationalModule, IPol
this, this,
DataInPorts, DataInPorts,
"Vector Input Type", "Vector Input Type",
EnigmosConstant.DataPortTypes.R2, DataTypeConstant.BaseDataTypes.R2,
EnigmosConstant.DataPortTypes.VectorTypes DataTypeConstant.DataTypeOptions.VectorTypes
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.ScalarTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { VectorInputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { VectorInputGroup };
PostInit(); PostInit();
@@ -39,7 +39,7 @@ public abstract partial class DotProductModule : BinaryComputationalModule, IPol
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => (object, DataType) Func(CacheItem cache) =>
GlobalProvider.PolymorphismProvider!.Dot(this.X(cache), this.Y(cache)); GlobalProvider.PolymorphismProvider!.Dot(this.X(cache), this.Y(cache));
this.Define(Func); this.Define(Func);
} }
@@ -47,9 +47,9 @@ public abstract partial class DotProductModule : BinaryComputationalModule, IPol
public void Inference() public void Inference()
{ {
if (GlobalProvider.DataTypeProvider!.IsComplexTensorType(VectorInputGroup!.SelectedType)) if (GlobalProvider.DataTypeProvider!.IsComplexTensorType(VectorInputGroup!.SelectedType))
OutputGroup!.SelectedType = EnigmosConstant.DataPortTypes.Complex; OutputGroup!.SelectedType = DataTypeConstant.BaseDataTypes.Complex;
else else
OutputGroup!.SelectedType = EnigmosConstant.DataPortTypes.Real; OutputGroup!.SelectedType = DataTypeConstant.BaseDataTypes.Real;
} }
} }

6
Modules/ComputationalModules/Binary/LogicalAlternativeDenialModule.cs
View File

@@ -1,4 +1,4 @@
using Godot; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -9,8 +9,8 @@ public abstract partial class LogicalAlternativeDenialModule : BinaryLogicModule
{ {
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => (object, DataType) Func(CacheItem cache) =>
(!this.X(cache).Bit | !this.Y(cache).Bit, EnigmosConstant.DataPortTypes.Bit); (!this.X(cache).Bit | !this.Y(cache).Bit, DataTypeConstant.BaseDataTypes.Bit);
this.Define(Func); this.Define(Func);
} }

6
Modules/ComputationalModules/Binary/LogicalBiconditionalModule.cs
View File

@@ -1,4 +1,4 @@
using Godot; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -9,8 +9,8 @@ public abstract partial class LogicalBiconditionalModule : BinaryLogicModule
{ {
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => (object, DataType) Func(CacheItem cache) =>
(!(this.X(cache).Bit ^ this.Y(cache).Bit), EnigmosConstant.DataPortTypes.Bit); (!(this.X(cache).Bit ^ this.Y(cache).Bit), DataTypeConstant.BaseDataTypes.Bit);
this.Define(Func); this.Define(Func);

6
Modules/ComputationalModules/Binary/LogicalConjunctionModule.cs
View File

@@ -1,4 +1,4 @@
using Godot; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -13,8 +13,8 @@ public abstract partial class LogicalConjunctionModule : BinaryLogicModule
{ {
var x = DataOutPorts.Length; var x = DataOutPorts.Length;
(object, StringName) Func(CacheItem cache) => (object, DataType) Func(CacheItem cache) =>
(this.X(cache).Bit & this.Y(cache).Bit, EnigmosConstant.DataPortTypes.Bit); (this.X(cache).Bit & this.Y(cache).Bit, DataTypeConstant.BaseDataTypes.Bit);
this.Define(Func); this.Define(Func);
} }

6
Modules/ComputationalModules/Binary/LogicalDisjunctionModule.cs
View File

@@ -1,4 +1,4 @@
using Godot; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -10,8 +10,8 @@ public abstract partial class LogicalDisjunctionModule : BinaryLogicModule
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem x) => (object, DataType) Func(CacheItem x) =>
(this.X(x).Bit | this.Y(x).Bit, EnigmosConstant.DataPortTypes.Bit); (this.X(x).Bit | this.Y(x).Bit, DataTypeConstant.BaseDataTypes.Bit);
this.Define(Func); this.Define(Func);
} }

6
Modules/ComputationalModules/Binary/LogicalExclusiveDisjunctionModule.cs
View File

@@ -1,4 +1,4 @@
using Godot; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -9,8 +9,8 @@ public abstract partial class LogicalExclusiveDisjunctionModule : BinaryLogicMod
{ {
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) (object, DataType) Func(CacheItem cache)
=> (this.X(cache).Bit ^ this.Y(cache).Bit, EnigmosConstant.DataPortTypes.Bit); => (this.X(cache).Bit ^ this.Y(cache).Bit, DataTypeConstant.BaseDataTypes.Bit);
this.Define(Func); this.Define(Func);
} }

2
Modules/ComputationalModules/Binary/LogicalImplicationModule.cs
View File

@@ -8,7 +8,7 @@ public abstract partial class LogicalImplicationModule : BinaryLogicModule
public override void Define() public override void Define()
{ {
this.Define( this.Define(
x => (!this.X(x).Bit | this.Y(x).Bit, EnigmosConstant.DataPortTypes.Bit) x => (!this.X(x).Bit | this.Y(x).Bit, DataTypeConstant.BaseDataTypes.Bit)
); );
} }
} }

2
Modules/ComputationalModules/Binary/LogicalJointDenialModule.cs
View File

@@ -11,7 +11,7 @@ public abstract partial class LogicalJointDenialModule : BinaryLogicModule
x => x =>
( (
!this.X(x).Bit & !this.Y(x).Bit, !this.X(x).Bit & !this.Y(x).Bit,
EnigmosConstant.DataPortTypes.Bit DataTypeConstant.BaseDataTypes.Bit
) )
); );
} }

6
Modules/ComputationalModules/Binary/LogicalNonimplicationModule.cs
View File

@@ -1,4 +1,4 @@
using Godot; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -9,8 +9,8 @@ public abstract partial class LogicalNonimplicationModule : BinaryLogicModule
{ {
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => (object, DataType) Func(CacheItem cache) =>
(this.X(cache).Bit & !this.Y(cache).Bit, EnigmosConstant.DataPortTypes.Bit); (this.X(cache).Bit & !this.Y(cache).Bit, DataTypeConstant.BaseDataTypes.Bit);
this.Define(Func); this.Define(Func);
} }

15
Modules/ComputationalModules/Binary/MaxModule.cs
View File

@@ -1,6 +1,5 @@
using Godot; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -12,18 +11,18 @@ public abstract partial class MaxModule : BinaryComputationalModule, IOperationM
{ {
base.Init(); base.Init();
this.DataOutInit("Output", 3); this.DataOutInit("Output", 3);
this.SetInputType(EnigmosConstant.DataPortTypes.Real); this.SetInputType(DataTypeConstant.BaseDataTypes.Real);
this.SetOutputType(EnigmosConstant.DataPortTypes.Real); this.SetOutputType(DataTypeConstant.BaseDataTypes.Real);
PostInit(); PostInit();
} }
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) (object, DataType) Func(CacheItem cache)
{ {
if (this.X(cache).Double > this.Y(cache).Double) if (this.X(cache).Real > this.Y(cache).Real)
return (this.X(cache), EnigmosConstant.DataPortTypes.Real); return (this.X(cache), DataTypeConstant.BaseDataTypes.Real);
return (this.Y(cache), EnigmosConstant.DataPortTypes.Real); return (this.Y(cache), DataTypeConstant.BaseDataTypes.Real);
} }
this.Define(Func); this.Define(Func);
} }

11
Modules/ComputationalModules/Binary/MinModule.cs
View File

@@ -1,6 +1,5 @@
using Godot; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -12,16 +11,16 @@ public abstract partial class MinModule : BinaryComputationalModule, IDuplicateO
{ {
base.Init(); base.Init();
this.DataOutInit("Output", 3); this.DataOutInit("Output", 3);
this.SetInputType(EnigmosConstant.DataPortTypes.Real); this.SetInputType(DataTypeConstant.BaseDataTypes.Real);
this.SetOutputType(EnigmosConstant.DataPortTypes.Real); this.SetOutputType(DataTypeConstant.BaseDataTypes.Real);
PostInit(); PostInit();
} }
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) (object, DataType) Func(CacheItem cache)
{ {
if (this.X(cache).Double < this.Y(cache).Double) if (this.X(cache).Real < this.Y(cache).Real)
return (this.X(cache).Data!, this.X(cache).Type!); return (this.X(cache).Data!, this.X(cache).Type!);
return (this.Y(cache).Data!, this.Y(cache).Type!); return (this.Y(cache).Data!, this.Y(cache).Type!);
} }

12
Modules/ComputationalModules/Binary/MultiplicationModule.cs
View File

@@ -1,8 +1,8 @@
using Godot; using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -24,15 +24,15 @@ public abstract partial class MultiplicationModule : BinaryComputationalModule,
this, this,
DataInPorts, DataInPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.ScalarTypes
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"Output Port Type", "Output Port Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.NumericTypes DataTypeConstant.DataTypeOptions.ScalarTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup };
PostInit(); PostInit();
@@ -40,7 +40,7 @@ public abstract partial class MultiplicationModule : BinaryComputationalModule,
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => (object, DataType) Func(CacheItem cache) =>
GlobalProvider.PolymorphismProvider!.Mul(this.X(cache), this.Y(cache)); GlobalProvider.PolymorphismProvider!.Mul(this.X(cache), this.Y(cache));
this.Define(Func); this.Define(Func);
} }

14
Modules/ComputationalModules/Binary/PowerModule.cs
View File

@@ -1,8 +1,8 @@
using Godot; using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
@@ -24,16 +24,16 @@ public abstract partial class PowerModule : BinaryComputationalModule, IPolymorp
this, this,
new IDataInPort[] { DataInPorts[0] }, new IDataInPort[] { DataInPorts[0] },
"Base Tensor Type", "Base Tensor Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.NumericTypes DataTypeConstant.DataTypeOptions.ScalarTypes
); );
DataInPorts[1].SetDataType(EnigmosConstant.DataPortTypes.Complex); DataInPorts[1].SetDataType(DataTypeConstant.BaseDataTypes.Complex);
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.ScalarTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { TensorInputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { TensorInputGroup };
PostInit(); PostInit();
@@ -41,7 +41,7 @@ public abstract partial class PowerModule : BinaryComputationalModule, IPolymorp
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => GlobalProvider.PolymorphismProvider!.Pow(this.X(cache), this.Y(cache)); (object, DataType) Func(CacheItem cache) => GlobalProvider.PolymorphismProvider!.Pow(this.X(cache), this.Y(cache));
this.Define(Func); this.Define(Func);
} }

16
Modules/ComputationalModules/Binary/ScalarDivisionModule.cs
View File

@@ -1,8 +1,8 @@
using Godot; using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
@@ -29,22 +29,22 @@ public abstract partial class ScalarDivisionModule : BinaryComputationalModule,
this, this,
new IDataInPort[] { DataInPorts[0] }, new IDataInPort[] { DataInPorts[0] },
"Tensor Input Type", "Tensor Input Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.R2,
EnigmosConstant.DataPortTypes.VectorTypes DataTypeConstant.DataTypeOptions.VectorTypes
); );
ScalarInputGroup =GlobalProvider.DataStructureProvider.NewDataInGroup( ScalarInputGroup =GlobalProvider.DataStructureProvider.NewDataInGroup(
this, this,
new IDataInPort[] { DataInPorts[1] }, new IDataInPort[] { DataInPorts[1] },
"Scalar Input Type", "Scalar Input Type",
EnigmosConstant.DataPortTypes.R2, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.VectorTypes DataTypeConstant.DataTypeOptions.ScalarTypes
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.VectorTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { ScalarInputGroup, TensorInputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { ScalarInputGroup, TensorInputGroup };
SelectedOption = 0; SelectedOption = 0;
@@ -54,7 +54,7 @@ public abstract partial class ScalarDivisionModule : BinaryComputationalModule,
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => GlobalProvider.PolymorphismProvider!.ScalarDiv(this.X(cache), this.Y(cache)); (object, DataType) Func(CacheItem cache) => GlobalProvider.PolymorphismProvider!.ScalarDiv(this.X(cache), this.Y(cache));
this.Define(Func); this.Define(Func);
} }

16
Modules/ComputationalModules/Binary/ScalarMultiplicationModule.cs
View File

@@ -1,8 +1,8 @@
using Godot; using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
@@ -28,22 +28,22 @@ public abstract partial class ScalarMultiplicationModule :
this, this,
new IDataInPort[] { DataInPorts[0] }, new IDataInPort[] { DataInPorts[0] },
"Scalar Input Type", "Scalar Input Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.NumericTypes DataTypeConstant.DataTypeOptions.ScalarTypes
); );
TensorInputGroup = GlobalProvider.DataStructureProvider.NewDataInGroup( TensorInputGroup = GlobalProvider.DataStructureProvider.NewDataInGroup(
this, this,
new IDataInPort[] { DataInPorts[1] }, new IDataInPort[] { DataInPorts[1] },
"Tensor Input Type", "Tensor Input Type",
EnigmosConstant.DataPortTypes.R2, DataTypeConstant.BaseDataTypes.R2,
EnigmosConstant.DataPortTypes.VectorTypes DataTypeConstant.DataTypeOptions.VectorTypes
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.VectorTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { ScalarInputGroup, TensorInputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { ScalarInputGroup, TensorInputGroup };
PostInit(); PostInit();
@@ -52,7 +52,7 @@ public abstract partial class ScalarMultiplicationModule :
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => (object, DataType) Func(CacheItem cache) =>
GlobalProvider.PolymorphismProvider!.ScalarMul(this.X(cache), this.Y(cache)); GlobalProvider.PolymorphismProvider!.ScalarMul(this.X(cache), this.Y(cache));
this.Define(Func); this.Define(Func);
} }

12
Modules/ComputationalModules/Binary/SubtractionModule.cs
View File

@@ -1,8 +1,8 @@
using Godot; using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -25,15 +25,15 @@ public abstract partial class SubtractionModule : BinaryComputationalModule,
this, this,
DataInPorts, DataInPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.TensorTypes
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"Output Port Type", "Output Port Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyTensor DataTypeConstant.DataTypeOptions.TensorTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup };
PostInit(); PostInit();
@@ -41,7 +41,7 @@ public abstract partial class SubtractionModule : BinaryComputationalModule,
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => GlobalProvider.PolymorphismProvider!.Sub(this.X(cache), this.Y(cache)); (object, DataType) Func(CacheItem cache) => GlobalProvider.PolymorphismProvider!.Sub(this.X(cache), this.Y(cache));
} }

25
Modules/ComputationalModules/Binary/V2Module.cs
View File

@@ -1,10 +1,9 @@
using Enigmos.Ports.DataPorts;
using Godot; using Godot;
using Nocturnis.DataStructures; using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -32,15 +31,15 @@ public abstract partial class V2Module : BinaryComputationalModule,
this, this,
DataInPorts, DataInPorts,
"Scalar Input Type", "Scalar Input Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.NumericTypes DataTypeConstant.DataTypeOptions.ScalarTypes
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"", "",
EnigmosConstant.DataPortTypes.R2, DataTypeConstant.BaseDataTypes.R2,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.VectorTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { ScalarInputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { ScalarInputGroup };
PostInit(); PostInit();
@@ -48,14 +47,14 @@ public abstract partial class V2Module : BinaryComputationalModule,
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) (object, DataType) Func(CacheItem cache)
{ {
IData x = this.X(cache); DataVariable x = this.X(cache);
IData y = this.Y(cache); DataVariable y = this.Y(cache);
if (x.Type == EnigmosConstant.DataPortTypes.Complex || y.Type == EnigmosConstant.DataPortTypes.Complex) if (x.Type == DataTypeConstant.BaseDataTypes.Complex || y.Type == DataTypeConstant.BaseDataTypes.Complex)
return (new C2(x.Complex, y.Complex), EnigmosConstant.DataPortTypes.C2); return (new C2(x.Complex, y.Complex), DataTypeConstant.BaseDataTypes.C2);
return (new R2(x.Double, y.Double), EnigmosConstant.DataPortTypes.Real); return (new R2(x.Real, y.Real), DataTypeConstant.BaseDataTypes.Real);
} }
this.Define(Func); this.Define(Func);
} }

1
Modules/ComputationalModules/BinaryComputationalModule.cs
View File

@@ -1,5 +1,4 @@
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
namespace Enigmos.Modules.ComputationalModules; namespace Enigmos.Modules.ComputationalModules;

5
Modules/ComputationalModules/Nullary/ConstantModule.cs
View File

@@ -2,7 +2,6 @@ using Godot;
using Nocturnis.DataStructures.ConfigurableParameters; using Nocturnis.DataStructures.ConfigurableParameters;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
@@ -17,7 +16,7 @@ public abstract partial class ConstantModule : NullaryComputationalModule, IPara
{ {
base.Init(); base.Init();
this.DataOutInit("Output", 4); this.DataOutInit("Output", 4);
this.SetOutputType(EnigmosConstant.DataPortTypes.Real); this.SetOutputType(DataTypeConstant.BaseDataTypes.Real);
ConstValue = ConstValue =
GlobalProvider.DataStructureProvider!.NewDoubleParameter( GlobalProvider.DataStructureProvider!.NewDoubleParameter(
@@ -33,7 +32,7 @@ public abstract partial class ConstantModule : NullaryComputationalModule, IPara
public override void Define() public override void Define()
{ {
this.Define(cache => this.Define(cache =>
(ConstValue!.ParameterValue, EnigmosConstant.DataPortTypes.Real) (ConstValue!.ParameterValue, DataTypeConstant.BaseDataTypes.Real)
); );
} }

8
Modules/ComputationalModules/Nullary/KeyListenerModule.cs
View File

@@ -1,7 +1,7 @@
using Enigmos.Ports;
using Enigmos.Ports.DataPorts; using Enigmos.Ports.DataPorts;
using Godot; using Godot;
using Nocturnis.DataStructures.ConfigurableParameters; using Nocturnis.DataStructures.ConfigurableParameters;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
@@ -25,7 +25,7 @@ public abstract partial class KeyListenerModule : NullaryComputationalModule,
{ {
base.Init(); base.Init();
this.DataOutInit("Output", 3); this.DataOutInit("Output", 3);
this.SetOutputType(EnigmosConstant.DataPortTypes.Bit); this.SetOutputType(DataTypeConstant.BaseDataTypes.Bit);
ListeningKey = GlobalProvider.DataStructureProvider!.NewKeyParameter( ListeningKey = GlobalProvider.DataStructureProvider!.NewKeyParameter(
"Listening Key", "Listening Key",
UsingPreset && (PresetActionName != null) ? PresetActionName : "KeyListenAction" UsingPreset && (PresetActionName != null) ? PresetActionName : "KeyListenAction"
@@ -37,13 +37,13 @@ public abstract partial class KeyListenerModule : NullaryComputationalModule,
ListeningKey.ParameterValue = $"{ListeningKey.ParameterValue}{i}"; ListeningKey.ParameterValue = $"{ListeningKey.ParameterValue}{i}";
if(!UsingPreset) if(!UsingPreset)
InputMap.AddAction(ListeningKey.ParameterValue); InputMap.AddAction(ListeningKey.ParameterValue);
GlobalProvider.SceneProvider!.RootScene.KeyListener.Register(this); GlobalProvider.SceneProvider!.RootScene!.KeyListener.Register(this);
PostInit(); PostInit();
} }
public override void Define() public override void Define()
{ {
(object item, StringName type) Func(CacheItem cache) => (Pressed, EnigmosConstant.DataPortTypes.Bit); (object, DataType) Func(CacheItem cache) => (Pressed, DataTypeConstant.BaseDataTypes.Bit);
this.Define(Func); this.Define(Func);
} }
} }

5
Modules/ComputationalModules/Nullary/NormalDistributionModule.cs
View File

@@ -2,7 +2,6 @@ using Enigmos.Ports.DataPorts;
using Nocturnis.DataStructures.ConfigurableParameters; using Nocturnis.DataStructures.ConfigurableParameters;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
@@ -28,7 +27,7 @@ public abstract partial class NormalDistributionModule : NullaryComputationalMod
{ {
base.Init(); base.Init();
this.DataOutInit("Output", 4); this.DataOutInit("Output", 4);
this.SetOutputType(EnigmosConstant.DataPortTypes.Real); this.SetOutputType(DataTypeConstant.BaseDataTypes.Real);
Mu = GlobalProvider.DataStructureProvider!.NewDoubleParameter("mu", -1, 1, 0); Mu = GlobalProvider.DataStructureProvider!.NewDoubleParameter("mu", -1, 1, 0);
Sigma = GlobalProvider.DataStructureProvider.NewDoubleParameter("sigma", 0, 2, 1); Sigma = GlobalProvider.DataStructureProvider.NewDoubleParameter("sigma", 0, 2, 1);
ConfigurableParameters = new HashSet<IConfigurableParameter> { Mu, Sigma }; ConfigurableParameters = new HashSet<IConfigurableParameter> { Mu, Sigma };
@@ -40,7 +39,7 @@ public abstract partial class NormalDistributionModule : NullaryComputationalMod
foreach (IDataOutPort op in DataOutPorts) foreach (IDataOutPort op in DataOutPorts)
{ {
op.OutData.UpdateCalculation(x => op.OutData.UpdateCalculation(x =>
(Normal.Get() * Sigma!.ParameterValue - Mu!.ParameterValue, EnigmosConstant.DataPortTypes.Real) (Normal.Get() * Sigma!.ParameterValue - Mu!.ParameterValue, DataTypeConstant.BaseDataTypes.Real)
); );
} }
} }

2
Modules/ComputationalModules/NullaryComputationalModule.cs
View File

@@ -1,6 +1,4 @@
using Enigmos.Ports;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
namespace Enigmos.Modules.ComputationalModules; namespace Enigmos.Modules.ComputationalModules;

11
Modules/ComputationalModules/Ternary/SelectorModule.cs
View File

@@ -1,8 +1,7 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts; using Nocturnis.Enigmos.Ports.DataPorts;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
@@ -25,17 +24,17 @@ public abstract partial class SelectorModule : TernaryComputationalModule,
this, this,
new IDataPort[]{DataInPorts[1], DataInPorts[2]}.Union(DataOutPorts).ToArray(), new IDataPort[]{DataInPorts[1], DataInPorts[2]}.Union(DataOutPorts).ToArray(),
"Data Type", "Data Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyType DataTypeConstant.DataTypeOptions.AnyType
); );
DataInPorts[0].SetDataType(EnigmosConstant.DataPortTypes.Bit); DataInPorts[0].SetDataType(DataTypeConstant.BaseDataTypes.Bit);
PostInit(); PostInit();
} }
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) (object, DataType) Func(CacheItem cache)
{ {
if (this.X(cache).Bit) if (this.X(cache).Bit)
return (this.Y(cache).Data!, this.Y(cache).Type!); return (this.Y(cache).Data!, this.Y(cache).Type!);

1
Modules/ComputationalModules/TernaryComputationalModule.cs
View File

@@ -1,5 +1,4 @@
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
namespace Enigmos.Modules.ComputationalModules; namespace Enigmos.Modules.ComputationalModules;

15
Modules/ComputationalModules/Unary/CopyModule.cs
View File

@@ -1,8 +1,7 @@
using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -23,15 +22,15 @@ public abstract partial class CopyModule : UnaryComputationalModule,
this, this,
DataInPorts, DataInPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.AnyType
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider!.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"Output Port Type", "Output Port Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyType DataTypeConstant.DataTypeOptions.AnyType
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup };
PostInit(); PostInit();
@@ -39,7 +38,7 @@ public abstract partial class CopyModule : UnaryComputationalModule,
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => (this.X(cache).Data, this.X(cache).Type)!; (object, DataType) Func(CacheItem cache) => (this.X(cache).Data, this.X(cache).Type)!;
this.Define(Func); this.Define(Func);
} }
public void Inference() => InputGroup!.SelectedType = OutputGroup!.SelectedType; public void Inference() => InputGroup!.SelectedType = OutputGroup!.SelectedType;

9
Modules/ComputationalModules/Unary/LogicalNegationModule.cs
View File

@@ -1,6 +1,5 @@
using Godot; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -12,14 +11,14 @@ public abstract partial class LogicalNegationModule : UnaryComputationalModule,
{ {
base.Init(); base.Init();
this.DataOutInit("Output", 1); this.DataOutInit("Output", 1);
this.SetInputType(EnigmosConstant.DataPortTypes.Bit); this.SetInputType(DataTypeConstant.BaseDataTypes.Bit);
this.SetOutputType(EnigmosConstant.DataPortTypes.Bit); this.SetOutputType(DataTypeConstant.BaseDataTypes.Bit);
PostInit(); PostInit();
} }
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem cache) => (!this.X(cache).Bit, EnigmosConstant.DataPortTypes.Bit); (object, DataType) Func(CacheItem cache) => (!this.X(cache).Bit, DataTypeConstant.BaseDataTypes.Bit);
this.Define(Func); this.Define(Func);
} }
} }

14
Modules/ComputationalModules/Unary/NegationModule.cs
View File

@@ -1,9 +1,7 @@
using Enigmos.Ports.DataPorts;
using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -25,15 +23,15 @@ public abstract partial class NegationModule : UnaryComputationalModule, IPolymo
this, this,
DataInPorts, DataInPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.TensorTypes
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"Output Port Type", "Output Port Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyTensor DataTypeConstant.DataTypeOptions.TensorTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup };
PostInit(); PostInit();
@@ -42,7 +40,7 @@ public abstract partial class NegationModule : UnaryComputationalModule, IPolymo
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem c) => (object, DataType) Func(CacheItem c) =>
GlobalProvider.PolymorphismProvider!.Neg(this.X(c)); GlobalProvider.PolymorphismProvider!.Neg(this.X(c));
this.Define(Func); this.Define(Func);
} }

14
Modules/ComputationalModules/Unary/SquareModule.cs
View File

@@ -1,8 +1,8 @@
using Godot; using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -23,15 +23,15 @@ public abstract partial class SquareModule : UnaryComputationalModule, IPolymorp
this, this,
DataInPorts, DataInPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.ScalarTypes
); );
OutputGroup = GlobalProvider.DataStructureProvider.NewDataPortGroup( OutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"Output Port Type", "Output Port Type",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.NumericTypes DataTypeConstant.DataTypeOptions.ScalarTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { OutputGroup };
PostInit(); PostInit();
@@ -39,7 +39,7 @@ public abstract partial class SquareModule : UnaryComputationalModule, IPolymorp
public override void Define() public override void Define()
{ {
(object, StringName) Func(CacheItem c) => GlobalProvider.PolymorphismProvider!.Square(this.X(c)); (object, DataType) Func(CacheItem c) => GlobalProvider.PolymorphismProvider!.Square(this.X(c));
this.Define(Func); this.Define(Func);
} }

32
Modules/ComputationalModules/Unary/V2ComponentModule.cs
View File

@@ -1,9 +1,9 @@
using Godot; using Godot;
using Nocturnis.DataStructures; using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -26,15 +26,15 @@ public abstract partial class V2ComponentModule : UnaryComputationalModule, IPol
this, this,
DataInPorts, DataInPorts,
"Vector Input Type", "Vector Input Type",
EnigmosConstant.DataPortTypes.R2, DataTypeConstant.BaseDataTypes.R2,
EnigmosConstant.DataPortTypes.VectorTypes DataTypeConstant.DataTypeOptions.VectorTypes
); );
ScalarOutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup( ScalarOutputGroup = GlobalProvider.DataStructureProvider.NewDataOutGroup(
this, this,
DataOutPorts, DataOutPorts,
"", "",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
Array.Empty<StringName>() DataTypeConstant.DataTypeOptions.ScalarTypes
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { VectorInputGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { VectorInputGroup };
PostInit(); PostInit();
@@ -42,19 +42,19 @@ public abstract partial class V2ComponentModule : UnaryComputationalModule, IPol
public override void Define() public override void Define()
{ {
(object, StringName) Func1(CacheItem c) (object, DataType) Func1(CacheItem c)
{ {
IData v = this.X(c); DataVariable v = this.X(c);
if (v.Type == EnigmosConstant.DataPortTypes.R2) if (v.Type == DataTypeConstant.BaseDataTypes.R2)
return (v.R2[1], EnigmosConstant.DataPortTypes.Real); return (v.R2[1], DataTypeConstant.BaseDataTypes.Real);
return (v.C2[1], EnigmosConstant.DataPortTypes.Complex); return (v.C2[1], DataTypeConstant.BaseDataTypes.Complex);
} }
(object, StringName) Func2(CacheItem c) (object, DataType) Func2(CacheItem c)
{ {
IData v = this.X(c); DataVariable v = this.X(c);
if (v.Type == EnigmosConstant.DataPortTypes.R2) if (v.Type == DataTypeConstant.BaseDataTypes.R2)
return (v.R2[2], EnigmosConstant.DataPortTypes.Real); return (v.R2[2], DataTypeConstant.BaseDataTypes.Real);
return (v.C2[2], EnigmosConstant.DataPortTypes.Complex); return (v.C2[2], DataTypeConstant.BaseDataTypes.Complex);
} }
DataOutPorts[0].OutData.UpdateCalculation(Func1); DataOutPorts[0].OutData.UpdateCalculation(Func1);
DataOutPorts[1].OutData.UpdateCalculation(Func2); DataOutPorts[1].OutData.UpdateCalculation(Func2);

1
Modules/ComputationalModules/UnaryComputationalModule.cs
View File

@@ -1,6 +1,5 @@
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
namespace Enigmos.Modules.ComputationalModules; namespace Enigmos.Modules.ComputationalModules;

3
Modules/ControllingModules/ActionModules/AttackActionModule.cs
View File

@@ -1,5 +1,4 @@
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Controls; using Nocturnis.GlobalManagement.Controls;
@@ -22,7 +21,7 @@ public abstract partial class AttackActionModule : ActionModule, ITerminalModule
base.Init(); base.Init();
this.SignalInInit("SignalIn", 4); this.SignalInInit("SignalIn", 4);
this.DataInInit("Input", 1); this.DataInInit("Input", 1);
DataInPorts[0].SetDataType(EnigmosConstant.DataPortTypes.R2); DataInPorts[0].SetDataType(DataTypeConstant.BaseDataTypes.R2);
PostInit(); PostInit();
} }

5
Modules/ControllingModules/ActionModules/MoveActionModule.cs
View File

@@ -1,7 +1,4 @@
using Enigmos.Ports.DataPorts;
using Enigmos.Ports.SignalPorts;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Controls; using Nocturnis.GlobalManagement.Controls;
@@ -25,7 +22,7 @@ public abstract partial class MoveActionModule : ActionModule, ITerminalModule
base.Init(); base.Init();
this.DataInInit("Input", 1); this.DataInInit("Input", 1);
this.SignalInInit("SignalIn", 4); this.SignalInInit("SignalIn", 4);
DataInPorts[0].SetDataType(EnigmosConstant.DataPortTypes.R2); DataInPorts[0].SetDataType(DataTypeConstant.BaseDataTypes.R2);
PostInit(); PostInit();
} }

1
Modules/ControllingModules/RootModule.cs
View File

@@ -1,7 +1,6 @@
using System.Diagnostics; using System.Diagnostics;
using Nocturnis.Creatures; using Nocturnis.Creatures;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.SignalPorts.Directions; using Nocturnis.Enigmos.Ports.SignalPorts.Directions;
namespace Enigmos.Modules.ControllingModules; namespace Enigmos.Modules.ControllingModules;

3
Modules/ControllingModules/SinglePoleDoubleThrowSwitchModule.cs
View File

@@ -1,6 +1,5 @@
using Nocturnis.DataStructures.ConfigurableParameters; using Nocturnis.DataStructures.ConfigurableParameters;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.Enigmos.Ports.SignalPorts.Directions; using Nocturnis.Enigmos.Ports.SignalPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
@@ -30,7 +29,7 @@ public abstract partial class SinglePoleDoubleThrowSwitchModule : PiplineModule,
this.DataInInit("Input", 1); this.DataInInit("Input", 1);
LeftPortForTrue = LeftPortForTrue =
GlobalProvider.DataStructureProvider!.NewBoolParameter("Redirect to:", "Left", "Right", true); GlobalProvider.DataStructureProvider!.NewBoolParameter("Redirect to:", "Left", "Right", true);
DataInPorts[0].SetDataType(EnigmosConstant.DataPortTypes.Bit); DataInPorts[0].SetDataType(DataTypeConstant.BaseDataTypes.Bit);
ConfigurableParameters = new HashSet<IConfigurableParameter> { LeftPortForTrue }; ConfigurableParameters = new HashSet<IConfigurableParameter> { LeftPortForTrue };
PostInit(); PostInit();
} }

3
Modules/ControllingModules/SinglePoleSingleThrowSwitchModule.cs
View File

@@ -1,5 +1,4 @@
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Controls; using Nocturnis.GlobalManagement.Controls;
@@ -25,7 +24,7 @@ public abstract partial class SinglePoleSingleThrowSwitchModule : PiplineModule,
this.DataInInit("Input", 1); this.DataInInit("Input", 1);
this.SignalInInit("SignalIn", 1); this.SignalInInit("SignalIn", 1);
this.SignalOutInit("SignalOut", 1); this.SignalOutInit("SignalOut", 1);
DataInPorts[0].SetDataType(EnigmosConstant.DataPortTypes.Bit); DataInPorts[0].SetDataType(DataTypeConstant.BaseDataTypes.Bit);
PostInit(); PostInit();
} }

2
Modules/InterlayerModules/InterlayerDataOutModule.cs
View File

@@ -1,6 +1,4 @@
using Enigmos.Modules.ComputationalModules;
using Enigmos.Modules.SubModules; using Enigmos.Modules.SubModules;
using Godot;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Modules.InterlayerModules; using Nocturnis.Enigmos.Modules.InterlayerModules;

1
Modules/InterlayerModules/InterlayerSignalInModule.cs
View File

@@ -1,5 +1,4 @@
using Enigmos.Modules.SubModules; using Enigmos.Modules.SubModules;
using Godot;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.InterlayerModules; using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports; using Nocturnis.Enigmos.Ports;

11
Modules/ProgrammableModules/FilterModule/FilterInputProviderModule.cs
View File

@@ -1,15 +1,14 @@
using Enigmos.Boards; using Enigmos.Boards;
using Enigmos.Modules.SubModules; using Enigmos.Modules.SubModules;
using Godot; using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Skeleton.DataStructure; using Skeleton.DataStructure;
namespace Enigmos.Modules.ProgrammableModules.FilterModule; namespace Enigmos.Modules.ProgrammableModules.FilterModule;
public partial class FilterInputProviderModule : SubModule, IComputationalModule public abstract partial class FilterInputProviderModule : SubModule, IComputationalModule
{ {
public IDataOutPort[] DataOutPorts { get; set; } = Array.Empty<IDataOutPort>(); public IDataOutPort[] DataOutPorts { get; set; } = Array.Empty<IDataOutPort>();
public IDataOutPort? Output { get; set; } public IDataOutPort? Output { get; set; }
@@ -27,9 +26,9 @@ public partial class FilterInputProviderModule : SubModule, IComputationalModule
public void Define() public void Define()
{ {
(object, StringName) Func(CacheItem c) (object, DataType) Func(CacheItem c)
{ {
IData w = ParentBoard!.FilterModule!.CachedInputArray[ParentBoard.FilterModule.ProcessingIndex]; DataVariable w = ParentBoard!.FilterModule!.CachedInputArray[ParentBoard.FilterModule.ProcessingIndex];
return (w.Data, w.Type)!; return (w.Data, w.Type)!;
} }
Output!.OutData.UpdateCalculation(Func); Output!.OutData.UpdateCalculation(Func);

18
Modules/ProgrammableModules/FilterModule/FilterModule.cs
View File

@@ -1,7 +1,7 @@
using Enigmos.Boards; using Enigmos.Boards;
using Enigmos.Modules.InterlayerModules; using Enigmos.Modules.InterlayerModules;
using Enigmos.Modules.SubModules; using Enigmos.Modules.SubModules;
using Nocturnis.DataStructures; using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.InterlayerModules; using Nocturnis.Enigmos.Modules.InterlayerModules;
@@ -24,12 +24,12 @@ public abstract partial class FilterModule : ProgrammableModule,
private IDataPortGroup[] InterLayerGroups { get; set; } = Array.Empty<IDataPortGroup>(); private IDataPortGroup[] InterLayerGroups { get; set; } = Array.Empty<IDataPortGroup>();
private IDataPortGroup? ArrayGroup { get; set; } private IDataPortGroup? ArrayGroup { get; set; }
public IData[] CachedInputArray { get; set; } = Array.Empty<IData>(); public DataVariable[] CachedInputArray { get; set; } = Array.Empty<DataVariable>();
public IData? CachedResult { get; set; } public DataVariable? CachedResult { get; set; }
public bool ComputationFinished { get; set; } public bool ComputationFinished { get; set; }
public bool ComputationStarted { get; set; } public bool ComputationStarted { get; set; }
private List<IData> CachedListResult { get; set; } = new(); private List<DataVariable> CachedListResult { get; set; } = new();
public int ProcessingIndex { get; set; } public int ProcessingIndex { get; set; }
public new FilterModuleBoard UnderlyingBoard public new FilterModuleBoard UnderlyingBoard
@@ -60,7 +60,7 @@ public abstract partial class FilterModule : ProgrammableModule,
{ {
CachedInputArray = InputArray!.GetData.Get!.Array; CachedInputArray = InputArray!.GetData.Get!.Array;
ProcessingIndex = 0; ProcessingIndex = 0;
CachedListResult = new List<IData>(); CachedListResult = new List<DataVariable>();
ComputationStarted = true; ComputationStarted = true;
} }
@@ -106,8 +106,8 @@ public abstract partial class FilterModule : ProgrammableModule,
this, this,
new IDataPort[] { ExplicitInputs[i].DataIn!, UnderlyingBoard.FilterInputProxy[i].DataOut! }, new IDataPort[] { ExplicitInputs[i].DataIn!, UnderlyingBoard.FilterInputProxy[i].DataOut! },
$"Exterior In -> Interior Out{i}", $"Exterior In -> Interior Out{i}",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyType DataTypeConstant.DataTypeOptions.AnyType
); );
ExplicitInputs[i].Board = Board; ExplicitInputs[i].Board = Board;
} }
@@ -116,8 +116,8 @@ public abstract partial class FilterModule : ProgrammableModule,
this, this,
new IDataPort[] { InputArray, OutputArrayModule.Out! }, new IDataPort[] { InputArray, OutputArrayModule.Out! },
"Array Type", "Array Type",
EnigmosConstant.DataPortTypes.RealArray, DataTypeConstant.AutoDataTypes.AutoArray,
EnigmosConstant.DataPortTypes.AnyArray DataTypeConstant.DataTypeOptions.AnyArray
); );
ConfigurablePortGroups = InterLayerGroups.Union(new[] { ArrayGroup }).ToHashSet(); ConfigurablePortGroups = InterLayerGroups.Union(new[] { ArrayGroup }).ToHashSet();

10
Modules/ProgrammableModules/FunctionModule/FunctionModule.cs
View File

@@ -1,9 +1,7 @@
using Enigmos.Boards; using Enigmos.Boards;
using Enigmos.Modules.InterlayerModules; using Enigmos.Modules.InterlayerModules;
using Godot;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.InterlayerModules;
using Nocturnis.Enigmos.Ports; using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts; using Nocturnis.Enigmos.Ports.DataPorts;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
@@ -97,15 +95,15 @@ public abstract partial class FunctionModule : ProgrammableModule, IPolymorphism
this, this,
new IDataPort[] { ExplicitDataInModules[i].DataIn, UnderlyingBoard.DataOuts[i].DataOut }, new IDataPort[] { ExplicitDataInModules[i].DataIn, UnderlyingBoard.DataOuts[i].DataOut },
$"Exterior In -> Interior Out{i + 1}", $"Exterior In -> Interior Out{i + 1}",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyType DataTypeConstant.DataTypeOptions.AnyType
); );
InteriorToExterior[i] = GlobalProvider.DataStructureProvider.NewDataPortGroup( InteriorToExterior[i] = GlobalProvider.DataStructureProvider.NewDataPortGroup(
this, this,
new IDataPort[] { UnderlyingBoard.DataIns[i].DataIn, ExplicitDataOutModules[i].DataOut }, new IDataPort[] { UnderlyingBoard.DataIns[i].DataIn, ExplicitDataOutModules[i].DataOut },
$"Interior In -> Exterior Out{i + 1}", $"Interior In -> Exterior Out{i + 1}",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyType DataTypeConstant.DataTypeOptions.AnyType
); );
} }

9
Modules/ProgrammableModules/OptimizationModule/OptimizationInputProviderModule.cs
View File

@@ -1,9 +1,8 @@
using Enigmos.Boards; using Enigmos.Boards;
using Enigmos.Modules.SubModules; using Enigmos.Modules.SubModules;
using Godot; using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -26,9 +25,9 @@ public partial class OptimizationInputProviderModule : SubModule, IComputational
public void Define() public void Define()
{ {
(object, StringName) Func(CacheItem c) (object, DataType) Func(CacheItem c)
{ {
IData w = ParentBoard!.OptimizationModule!.CachedInputArray[ParentBoard.OptimizationModule.ProcessingIndex]; DataVariable w = ParentBoard!.OptimizationModule!.CachedInputArray[ParentBoard.OptimizationModule.ProcessingIndex];
return (w.Data, w.Type)!; return (w.Data, w.Type)!;
} }
Output!.OutData.UpdateCalculation(Func); Output!.OutData.UpdateCalculation(Func);

33
Modules/ProgrammableModules/OptimizationModule/OptimizationModule.cs
View File

@@ -2,10 +2,10 @@ using Enigmos.Boards;
using Enigmos.Modules.InterlayerModules; using Enigmos.Modules.InterlayerModules;
using Enigmos.Modules.SubModules; using Enigmos.Modules.SubModules;
using Enigmos.Ports.DataPorts; using Enigmos.Ports.DataPorts;
using Godot;
using Nocturnis.DataStructures;
using Nocturnis.DataStructures.ConfigurableParameters; using Nocturnis.DataStructures.ConfigurableParameters;
using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports; using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts; using Nocturnis.Enigmos.Ports.DataPorts;
@@ -25,11 +25,11 @@ public abstract partial class OptimizationModule : ProgrammableModule,
public bool ComputationStarted { get; set; } public bool ComputationStarted { get; set; }
private double? CachedOptimizeValue { get; set; } private double? CachedOptimizeValue { get; set; }
public IDataInPort? ArrayInput { get; set; } public IDataInPort? ArrayInput { get; set; }
public IData[] CachedInputArray { get; set; } = Array.Empty<IData>(); public DataVariable[] CachedInputArray { get; set; } = Array.Empty<DataVariable>();
public int ProcessingIndex { get; set; } public int ProcessingIndex { get; set; }
private IBoolParameter? UsingMax { get; set; } private IBoolParameter? UsingMax { get; set; }
public IData CachedResult { get; set; } = public DataVariable CachedResult { get; set; } =
GlobalProvider.DataStructureProvider!.NewData(0, EnigmosConstant.DataPortTypes.Null); GlobalProvider.DataStructureProvider!.NewData(0, DataTypeConstant.BaseDataTypes.Null);
public IDataInPort? InternalIterOut { get; set; } public IDataInPort? InternalIterOut { get; set; }
@@ -80,8 +80,7 @@ public abstract partial class OptimizationModule : ProgrammableModule,
} }
ComputationFinished = true; ComputationFinished = true;
CachedInputArray = Array.Empty<IData>(); CachedInputArray = Array.Empty<DataVariable>();
//CachedArray = Array.Empty<DataPackage>();
ProcessingIndex = 0; ProcessingIndex = 0;
CachedResult = GlobalProvider.DataStructureProvider!.NullData; CachedResult = GlobalProvider.DataStructureProvider!.NullData;
CachedOptimizeValue = null; CachedOptimizeValue = null;
@@ -94,8 +93,8 @@ public abstract partial class OptimizationModule : ProgrammableModule,
this, this,
new IDataPort[] { ExplicitInputs[i].DataIn!, UnderlyingBoard.ImplicitDataOuts[i].DataOut! }, new IDataPort[] { ExplicitInputs[i].DataIn!, UnderlyingBoard.ImplicitDataOuts[i].DataOut! },
$"Exterior In -> Interior Out{i}", $"Exterior In -> Interior Out{i}",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyType DataTypeConstant.DataTypeOptions.AnyType
); );
ExplicitInputs[i].Board = Board; ExplicitInputs[i].Board = Board;
} }
@@ -104,8 +103,8 @@ public abstract partial class OptimizationModule : ProgrammableModule,
this, this,
new IDataPort[] { ArrayInput }, new IDataPort[] { ArrayInput },
"Array Input Type", "Array Input Type",
EnigmosConstant.DataPortTypes.AnyArrayType, DataTypeConstant.AutoDataTypes.AutoArray,
EnigmosConstant.DataPortTypes.AnyArray DataTypeConstant.DataTypeOptions.AnyArray
); );
UsingMax = GlobalProvider.DataStructureProvider.NewBoolParameter( UsingMax = GlobalProvider.DataStructureProvider.NewBoolParameter(
"Method", "Method",
@@ -113,8 +112,8 @@ public abstract partial class OptimizationModule : ProgrammableModule,
"Min", "Min",
true true
); );
Output.Out!.SetDataType(EnigmosConstant.DataPortTypes.Real); Output.Out!.SetDataType(DataTypeConstant.BaseDataTypes.Real);
Selector!.Selector!.SetDataType(EnigmosConstant.DataPortTypes.Real); Selector!.Selector!.SetDataType(DataTypeConstant.BaseDataTypes.Real);
ConfigurableParameters = new HashSet<IConfigurableParameter> { UsingMax }; ConfigurableParameters = new HashSet<IConfigurableParameter> { UsingMax };
ConfigurablePortGroups = ConfigurablePortGroups =
InterlayerGroups.Union(new[] { OptimizationGroup }).ToHashSet(); InterlayerGroups.Union(new[] { OptimizationGroup }).ToHashSet();
@@ -125,7 +124,7 @@ public abstract partial class OptimizationModule : ProgrammableModule,
public void Inference() public void Inference()
{ {
StringName elementType = GlobalProvider.DataTypeProvider!.ToElement(OptimizationGroup!.SelectedType); DataType elementType = GlobalProvider.DataTypeProvider!.ToElement(OptimizationGroup!.SelectedType);
Output!.Out!.SetDataType(elementType); Output!.Out!.SetDataType(elementType);
UnderlyingBoard.InputProvider!.Output!.SetDataType(elementType); UnderlyingBoard.InputProvider!.Output!.SetDataType(elementType);
} }
@@ -138,7 +137,7 @@ public abstract partial class OptimizationModule : ProgrammableModule,
{ {
CachedOptimizeValue = null; CachedOptimizeValue = null;
CachedInputArray = InternalArrayIn!.OutData.Get!.Array; CachedInputArray = InternalArrayIn!.OutData.Get!.Array;
CachedResult = GlobalProvider.DataStructureProvider!.NewData(0, EnigmosConstant.DataPortTypes.Null); CachedResult = GlobalProvider.DataStructureProvider!.NewData(0, DataTypeConstant.BaseDataTypes.Null);
ProcessingIndex = 0; ProcessingIndex = 0;
} }
@@ -150,8 +149,8 @@ public abstract partial class OptimizationModule : ProgrammableModule,
(CachedInputArray[ProcessingIndex].Data, CachedInputArray[ProcessingIndex].Type)! (CachedInputArray[ProcessingIndex].Data, CachedInputArray[ProcessingIndex].Type)!
); );
UnderlyingBoard.InputProvider.Output.OutData.Expire(); UnderlyingBoard.InputProvider.Output.OutData.Expire();
double currentValue = UnderlyingBoard.Selector!.Selector!.GetData.Get!.Double; double currentValue = UnderlyingBoard.Selector!.Selector!.GetData.Get!.Real;
IData currentOut = InternalIterOut!.GetData.Get!; DataVariable currentOut = InternalIterOut!.GetData.Get!;
if (UsingMax!.ParameterValue) if (UsingMax!.ParameterValue)
{ {
if (CachedOptimizeValue == null || (CachedOptimizeValue < currentValue)) if (CachedOptimizeValue == null || (CachedOptimizeValue < currentValue))

1
Modules/ProgrammableModules/ProgrammableModule.cs
View File

@@ -1,6 +1,5 @@
using Enigmos.Boards; using Enigmos.Boards;
using Enigmos.Modules.InterlayerModules; using Enigmos.Modules.InterlayerModules;
using Enigmos.Modules.SubModules;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports; using Nocturnis.Enigmos.Ports;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;

4
Modules/SubModules/OutputSubModule.cs
View File

@@ -1,4 +1,4 @@
using Godot; using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Skeleton.DataStructure; using Skeleton.DataStructure;
@@ -24,7 +24,7 @@ public partial class OutputSubModule : SubModule, ISourceModule
public void Define() public void Define()
{ {
(object, StringName) Func(CacheItem c) (object, DataType) Func(CacheItem c)
{ {
if (!ParentModule!.ComputationFinished) if (!ParentModule!.ComputationFinished)
ParentModule!.Compute(); ParentModule!.Compute();

4
Modules/TerminalModules/EngineModule.cs
View File

@@ -19,7 +19,7 @@ public abstract partial class EngineModule : TerminalModule
public override void Init() public override void Init()
{ {
base.Init(); base.Init();
Throttle!.SetDataType(EnigmosConstant.DataPortTypes.Real); Throttle!.SetDataType(DataTypeConstant.BaseDataTypes.Real);
FuelTank = GetNode<IChemicalItemSlot>("FuelTank"); FuelTank = GetNode<IChemicalItemSlot>("FuelTank");
PostInit(); PostInit();
} }
@@ -33,7 +33,7 @@ public abstract partial class EngineModule : TerminalModule
return; return;
} }
HomogeneousMixture bottom = FuelTank.Item.ContentMaterial.LayerOrder.Last.Value; HomogeneousMixture bottom = FuelTank.Item.ContentMaterial.LayerOrder.Last.Value;
double consumption = Math.Min(bottom.Amount, Throttle!.GetData.Get!.Double.DoubleCut() * bottom.CombustRate); double consumption = Math.Min(bottom.Amount, Throttle!.GetData.Get!.Real.DoubleCut() * bottom.CombustRate);
EnigmosControl.Instance.Energy = consumption * bottom.Energy; EnigmosControl.Instance.Energy = consumption * bottom.Energy;
bottom.Amount -= consumption; bottom.Amount -= consumption;
} }

15
Modules/TerminalModules/MemoryModule.cs
View File

@@ -1,8 +1,7 @@
using Nocturnis.DataStructures; using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures.DataPortGroups; using Nocturnis.DataStructures.DataPortGroups;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts; using Nocturnis.Enigmos.Ports.DataPorts;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
@@ -12,7 +11,7 @@ namespace Enigmos.Modules.TerminalModules;
public abstract partial class MemoryModule : BaseModule, ITerminalModule, ISourceModule, IDuplicateOutputModule public abstract partial class MemoryModule : BaseModule, ITerminalModule, ISourceModule, IDuplicateOutputModule
{ {
private IData? Memory { get; set; } private DataVariable? Memory { get; set; }
private IDataPortGroup? MemoryPortGroup { get; set; } private IDataPortGroup? MemoryPortGroup { get; set; }
public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new(); public HashSet<IDataPortGroup> ConfigurablePortGroups { get; set; } = new();
@@ -22,18 +21,18 @@ public abstract partial class MemoryModule : BaseModule, ITerminalModule, ISourc
public override void Init() public override void Init()
{ {
base.Init(); base.Init();
Memory = GlobalProvider.DataStructureProvider!.NewData(0, EnigmosConstant.DataPortTypes.Null); Memory = GlobalProvider.DataStructureProvider!.NewData(0, DataTypeConstant.BaseDataTypes.Null);
this.DataInInit("Input", 3); this.DataInInit("Input", 3);
this.DataOutInit("Output", 4); this.DataOutInit("Output", 4);
DataInPorts[1].SetDataType(EnigmosConstant.DataPortTypes.Bit); DataInPorts[1].SetDataType(DataTypeConstant.BaseDataTypes.Bit);
DataInPorts[2].SetDataType(EnigmosConstant.DataPortTypes.Bit); DataInPorts[2].SetDataType(DataTypeConstant.BaseDataTypes.Bit);
MemoryPortGroup =GlobalProvider.DataStructureProvider!.NewDataPortGroup( MemoryPortGroup =GlobalProvider.DataStructureProvider!.NewDataPortGroup(
this, this,
new IDataPort[] { DataInPorts[0] }.Union(DataOutPorts).ToArray(), new IDataPort[] { DataInPorts[0] }.Union(DataOutPorts).ToArray(),
"Memory Data Type:", "Memory Data Type:",
EnigmosConstant.DataPortTypes.Real, DataTypeConstant.BaseDataTypes.Real,
EnigmosConstant.DataPortTypes.AnyType DataTypeConstant.DataTypeOptions.AnyType
); );
ConfigurablePortGroups = new HashSet<IDataPortGroup> { MemoryPortGroup }; ConfigurablePortGroups = new HashSet<IDataPortGroup> { MemoryPortGroup };
PostInit(); PostInit();

7
Modules/TerminalModules/SRLatchModule.cs
View File

@@ -1,6 +1,5 @@
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
@@ -36,13 +35,13 @@ public abstract partial class SRLatchModule : BaseModule,
base.Init(); base.Init();
this.DataInInit("Input",2); this.DataInInit("Input",2);
this.DataOutInit("Output", 2); this.DataOutInit("Output", 2);
this.SetOutputType(EnigmosConstant.DataPortTypes.Bit); this.SetOutputType(DataTypeConstant.BaseDataTypes.Bit);
this.SetInputType(EnigmosConstant.DataPortTypes.Bit); this.SetInputType(DataTypeConstant.BaseDataTypes.Bit);
PostInit(); PostInit();
} }
public void Define() public void Define()
{ {
this.Define(cache => (State, EnigmosConstant.DataPortTypes.Bit)); this.Define(cache => (State, DataTypeConstant.BaseDataTypes.Bit));
} }
} }

4
Modules/TerminalModules/TestingModules/LightEmittingDiodeModule.cs
View File

@@ -1,8 +1,6 @@
using Enigmos.Modules.ControllingModules;
using Enigmos.Ports.DataPorts; using Enigmos.Ports.DataPorts;
using Godot; using Godot;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
@@ -23,7 +21,7 @@ public abstract partial class LightEmittingDiodeModule : TerminalModule
Finished = true; Finished = true;
LightEmittingDiode = GetNode<Sprite2D>("LightEmittingDiode"); LightEmittingDiode = GetNode<Sprite2D>("LightEmittingDiode");
Input = this.GetPort<DataInPort>("Input"); Input = this.GetPort<DataInPort>("Input");
Input.SetDataType(EnigmosConstant.DataPortTypes.Bit); Input.SetDataType(DataTypeConstant.BaseDataTypes.Bit);
PostInit(); PostInit();
} }

4
Modules/TerminalModules/TestingModules/R2ReaderModule.cs
View File

@@ -1,5 +1,3 @@
using Enigmos.Modules.ControllingModules;
using Enigmos.Ports;
using Enigmos.Ports.DataPorts; using Enigmos.Ports.DataPorts;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
@@ -15,7 +13,7 @@ public abstract partial class R2ReaderModule : TerminalModule
{ {
base.Init(); base.Init();
DataIn = this.GetPort<DataInPort>("DataIn"); DataIn = this.GetPort<DataInPort>("DataIn");
DataIn.SetDataType(EnigmosConstant.DataPortTypes.R2); DataIn.SetDataType(DataTypeConstant.BaseDataTypes.R2);
R2Reader = GetNode<R2Reader>("R2Reader"); R2Reader = GetNode<R2Reader>("R2Reader");
R2Reader.Init(); R2Reader.Init();
PostInit(); PostInit();

9
Modules/TerminalModules/TestingModules/RealReaderModule.cs
View File

@@ -1,7 +1,6 @@
using Godot; using Godot;
using Nocturnis.Enigmos.Modules; using Nocturnis.Enigmos.Modules;
using Nocturnis.Enigmos.Modules.ComputationalModules; using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions; using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Nocturnis.GlobalManagement.Constants; using Nocturnis.GlobalManagement.Constants;
using Skeleton.Utils.Helpers; using Skeleton.Utils.Helpers;
@@ -17,7 +16,7 @@ public abstract partial class RealReaderModule : BaseModule, ITerminalModule, IO
{ {
base.Init(); base.Init();
this.DataInInit("Input", 3); this.DataInInit("Input", 3);
this.SetInputType(EnigmosConstant.DataPortTypes.Real); this.SetInputType(DataTypeConstant.BaseDataTypes.Real);
RealReader = GetNode<AnimatedSprite2D>("RealReader"); RealReader = GetNode<AnimatedSprite2D>("RealReader");
RealReader.SpeedScale = 0; RealReader.SpeedScale = 0;
RealReader.Play(); RealReader.Play();
@@ -26,9 +25,9 @@ public abstract partial class RealReaderModule : BaseModule, ITerminalModule, IO
public void Drain() public void Drain()
{ {
double max = DataInPorts[0].GetData.Get!.Double; double max = DataInPorts[0].GetData.Get!.Real;
double min = DataInPorts[2].GetData.Get!.Double; double min = DataInPorts[2].GetData.Get!.Real;
double value = DataInPorts[1].GetData.Get!.Double; double value = DataInPorts[1].GetData.Get!.Real;
double range = max - min; double range = max - min;
double percentage = (range == 0 ? 0d : value / range).DoubleCut(); double percentage = (range == 0 ? 0d : value / range).DoubleCut();
int frame = Mathf.FloorToInt(percentage * 122); int frame = Mathf.FloorToInt(percentage * 122);

4
Ports/DataPorts/DataOutPort.cs
View File

@@ -7,7 +7,7 @@ using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Ports.DataPorts; namespace Enigmos.Ports.DataPorts;
public partial class DataOutPort : DataPort, IDataOutPort public abstract partial class DataOutPort : DataPort, IDataOutPort
{ {
public new IComputationalModule Module public new IComputationalModule Module
{ {
@@ -36,5 +36,5 @@ public partial class DataOutPort : DataPort, IDataOutPort
return res; return res;
} }
public DataCache OutData { get; set; } = new(x => (0, "")); public DataCache OutData { get; set; } = new(x => (0, GlobalProvider.DataStructureProvider!.NullDataType));
} }

6
Ports/DataPorts/DataPort.cs
View File

@@ -1,8 +1,10 @@
using Enigmos.Cables; using Enigmos.Cables;
using Godot; using Godot;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Cables; using Nocturnis.Enigmos.Cables;
using Nocturnis.Enigmos.Ports; using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts; using Nocturnis.Enigmos.Ports.DataPorts;
using Nocturnis.GlobalManagement.Constants;
using Nocturnis.GlobalManagement.Providers; using Nocturnis.GlobalManagement.Providers;
namespace Enigmos.Ports.DataPorts; namespace Enigmos.Ports.DataPorts;
@@ -15,14 +17,14 @@ public abstract partial class DataPort : BasePort, IDataPort
set => base.ConnectedPort = value; set => base.ConnectedPort = value;
} }
protected Sprite2D? DataTypeTexture { get; set; } protected Sprite2D? DataTypeTexture { get; set; }
public StringName? DataType { get; set; } public DataType DataType { get; set; } = new(DataTypeConstant.BaseDataTypeNames.Null);
public override void Init() public override void Init()
{ {
DataTypeTexture = GetNode<Sprite2D>("DataTypeTexture"); DataTypeTexture = GetNode<Sprite2D>("DataTypeTexture");
DataTypeTexture.Visible = false; DataTypeTexture.Visible = false;
base.Init(); base.Init();
} }
public void SetDataType(StringName val) public void SetDataType(DataType val)
{ {
if(Connected && val != ConnectedPort!.DataType) if(Connected && val != ConnectedPort!.DataType)
this.Disconnect(); this.Disconnect();