diff --git a/Skills/FactorGraphs/Variable.cs b/Skills/FactorGraphs/Variable.cs index 7d64f51..80a3bc7 100644 --- a/Skills/FactorGraphs/Variable.cs +++ b/Skills/FactorGraphs/Variable.cs @@ -43,7 +43,7 @@ namespace Moserware.Skills.FactorGraphs public class KeyedVariable : Variable { - public KeyedVariable(TKey key, string name, VariableFactory parentFactory, int parentIndex, TValue prior) + public KeyedVariable(TKey key, string name, TValue prior) : base(name, prior) { Key = key; diff --git a/Skills/FactorGraphs/VariableFactory.cs b/Skills/FactorGraphs/VariableFactory.cs index 1e1a5b0..d07b5ff 100644 --- a/Skills/FactorGraphs/VariableFactory.cs +++ b/Skills/FactorGraphs/VariableFactory.cs @@ -6,7 +6,6 @@ namespace Moserware.Skills.FactorGraphs public class VariableFactory { // using a Func to encourage fresh copies in case it's overwritten - private readonly List> _CreatedVariables = new List>(); private readonly Func _VariablePriorInitializer; public VariableFactory(Func variablePriorInitializer) @@ -20,7 +19,6 @@ namespace Moserware.Skills.FactorGraphs String.Format(nameFormat, args), _VariablePriorInitializer()); - _CreatedVariables.Add(newVar); return newVar; } @@ -28,12 +26,9 @@ namespace Moserware.Skills.FactorGraphs { var newVar = new KeyedVariable( key, - String.Format(nameFormat, args), - this, - _CreatedVariables.Count, + String.Format(nameFormat, args), _VariablePriorInitializer()); - - _CreatedVariables.Add(newVar); + return newVar; } } diff --git a/Skills/bin/Debug/Moserware.Skills.dll b/Skills/bin/Debug/Moserware.Skills.dll index 52a75bf..7d29b38 100644 Binary files a/Skills/bin/Debug/Moserware.Skills.dll and b/Skills/bin/Debug/Moserware.Skills.dll differ diff --git a/Skills/bin/Debug/Moserware.Skills.pdb b/Skills/bin/Debug/Moserware.Skills.pdb index f1ac5b1..fedcd2f 100644 Binary files a/Skills/bin/Debug/Moserware.Skills.pdb and b/Skills/bin/Debug/Moserware.Skills.pdb differ diff --git a/Skills/bin/Release/Moserware.Skills.dll b/Skills/bin/Release/Moserware.Skills.dll index 57140f5..ce161dd 100644 Binary files a/Skills/bin/Release/Moserware.Skills.dll and b/Skills/bin/Release/Moserware.Skills.dll differ diff --git a/Skills/bin/Release/Moserware.Skills.pdb b/Skills/bin/Release/Moserware.Skills.pdb index 0449cef..f0f47f8 100644 Binary files a/Skills/bin/Release/Moserware.Skills.pdb and b/Skills/bin/Release/Moserware.Skills.pdb differ