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

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

@@ -1,15 +1,14 @@
using Enigmos.Boards;
using Enigmos.Modules.SubModules;
using Godot;
using Nocturnis.DataStructures;
using Nocturnis.DataStructures.Data;
using Nocturnis.DataStructures.DataTypes;
using Nocturnis.Enigmos.Modules.ComputationalModules;
using Nocturnis.Enigmos.Ports;
using Nocturnis.Enigmos.Ports.DataPorts.Directions;
using Skeleton.DataStructure;
namespace Enigmos.Modules.ProgrammableModules.FilterModule;
public partial class FilterInputProviderModule : SubModule, IComputationalModule
public abstract partial class FilterInputProviderModule : SubModule, IComputationalModule
{
public IDataOutPort[] DataOutPorts { get; set; } = Array.Empty<IDataOutPort>();
public IDataOutPort? Output { get; set; }
@@ -27,9 +26,9 @@ public partial class FilterInputProviderModule : SubModule, IComputationalModule
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)!;
}
Output!.OutData.UpdateCalculation(Func);

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

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

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

@@ -1,9 +1,7 @@
using Enigmos.Boards;
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;
@@ -97,15 +95,15 @@ public abstract partial class FunctionModule : ProgrammableModule, IPolymorphism
this,
new IDataPort[] { ExplicitDataInModules[i].DataIn, UnderlyingBoard.DataOuts[i].DataOut },
$"Exterior In -> Interior Out{i + 1}",
EnigmosConstant.DataPortTypes.Real,
EnigmosConstant.DataPortTypes.AnyType
DataTypeConstant.BaseDataTypes.Real,
DataTypeConstant.DataTypeOptions.AnyType
);
InteriorToExterior[i] = GlobalProvider.DataStructureProvider.NewDataPortGroup(
this,
new IDataPort[] { UnderlyingBoard.DataIns[i].DataIn, ExplicitDataOutModules[i].DataOut },
$"Interior In -> Exterior Out{i + 1}",
EnigmosConstant.DataPortTypes.Real,
EnigmosConstant.DataPortTypes.AnyType
DataTypeConstant.BaseDataTypes.Real,
DataTypeConstant.DataTypeOptions.AnyType
);
}

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

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

1
Modules/ProgrammableModules/ProgrammableModule.cs
View File

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