diff --git a/Skills/FactorGraphs/Variable.cs b/Skills/FactorGraphs/Variable.cs index 0ea1e40..7d64f51 100644 --- a/Skills/FactorGraphs/Variable.cs +++ b/Skills/FactorGraphs/Variable.cs @@ -5,15 +5,11 @@ namespace Moserware.Skills.FactorGraphs public class Variable { private readonly string _Name; - private readonly VariableFactory _ParentFactory; private readonly TValue _Prior; - private int _ParentIndex; - public Variable(string name, VariableFactory parentFactory, int parentIndex, TValue prior) + public Variable(string name, TValue prior) { _Name = "Variable[" + name + "]"; - _ParentFactory = parentFactory; - _ParentIndex = parentIndex; _Prior = prior; ResetToPrior(); } @@ -34,7 +30,7 @@ namespace Moserware.Skills.FactorGraphs public class DefaultVariable : Variable { public DefaultVariable() - : base("Default", null, 0, default(TValue)) + : base("Default", default(TValue)) { } @@ -48,7 +44,7 @@ namespace Moserware.Skills.FactorGraphs public class KeyedVariable : Variable { public KeyedVariable(TKey key, string name, VariableFactory parentFactory, int parentIndex, TValue prior) - : base(name, parentFactory, parentIndex, prior) + : base(name, prior) { Key = key; } diff --git a/Skills/FactorGraphs/VariableFactory.cs b/Skills/FactorGraphs/VariableFactory.cs index d6cb1d9..1e1a5b0 100644 --- a/Skills/FactorGraphs/VariableFactory.cs +++ b/Skills/FactorGraphs/VariableFactory.cs @@ -17,9 +17,7 @@ namespace Moserware.Skills.FactorGraphs public Variable CreateBasicVariable(string nameFormat, params object[] args) { var newVar = new Variable( - String.Format(nameFormat, args), - this, - _CreatedVariables.Count, + String.Format(nameFormat, args), _VariablePriorInitializer()); _CreatedVariables.Add(newVar); diff --git a/Skills/bin/Debug/Moserware.Skills.dll b/Skills/bin/Debug/Moserware.Skills.dll index 5452efb..52a75bf 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 f014cf6..f1ac5b1 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 be69042..57140f5 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 4158947..0449cef 100644 Binary files a/Skills/bin/Release/Moserware.Skills.pdb and b/Skills/bin/Release/Moserware.Skills.pdb differ