Data Type
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user