Skip to content

With pivot implementation #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 21, 2024
Merged

With pivot implementation #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
924fad0
With pivot implementation
likp Oct 15, 2024
613515f
Removed old DefaultSelection algorithm and associated tests
likp Oct 15, 2024
40feb81
Refactored the default selection algorithm
likp Oct 15, 2024
96085f6
Added comment
likp Oct 15, 2024
ca33f00
Added more comments
likp Oct 15, 2024
4d48806
Ran code clean up
likp Oct 15, 2024
bbef085
misst commiting test file
likp Oct 15, 2024
1155ee3
More refactoring on Case C in the default algorithm
likp Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
302 changes: 0 additions & 302 deletions PxWeb.UnitTests/Data/DataSelectionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,212 +5,6 @@ namespace PxWeb.UnitTests.Data
[TestClass]
public class DataSelectionTest
{
[TestMethod]
public void ShouldReturnSelectionFor_Time_Content()
{
PXModel model = GetPxModelDefaultSelection(2, 2); // Only Time and content cannot be eliminated. Content has 2 values
VariablesSelection variablesSelection = new VariablesSelection();
variablesSelection.Selection = new List<VariableSelection>();
SelectionHandler selectionHandler = new SelectionHandler(GetConfigMock().Object);

Problem? problem;
var builderMock = new Mock<IPXModelBuilder>();
builderMock.Setup(x => x.Model).Returns(model);
Selection[]? selections = selectionHandler.GetSelection(builderMock.Object, variablesSelection, out problem);

if (selections != null)
{
Selection? selection = selections.FirstOrDefault(s => s.VariableCode == "Period");
if (selection != null)
{
Assert.AreEqual(12, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "Content");
if (selection != null)
{
Assert.AreEqual(2, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var3");
if (selection != null)
{
Assert.AreEqual(0, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var4");
if (selection != null)
{
Assert.AreEqual(0, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var5");
if (selection != null)
{
Assert.AreEqual(0, selection.ValueCodes.Count);
}
}
else
{
Assert.Fail();
}
}

[TestMethod]
public void ShouldReturnSelectionFor_Time_ContentWithOneValue_OneMore()
{
PXModel model = GetPxModelDefaultSelection(3, 1); // Time, content and a third variable cannot be eliminated. Content has 1 value
VariablesSelection variablesSelection = new VariablesSelection();
variablesSelection.Selection = new List<VariableSelection>();
SelectionHandler selectionHandler = new SelectionHandler(GetConfigMock().Object);

Problem? problem;
var builderMock = new Mock<IPXModelBuilder>();
builderMock.Setup(x => x.Model).Returns(model);
Selection[]? selections = selectionHandler.GetSelection(builderMock.Object, variablesSelection, out problem);

if (selections != null)
{
Selection? selection = selections.FirstOrDefault(s => s.VariableCode == "Period");
if (selection != null)
{
Assert.AreEqual(12, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "Content");
if (selection != null)
{
Assert.AreEqual(1, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var3");
if (selection != null)
{
Assert.AreEqual(3, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var4");
if (selection != null)
{
Assert.AreEqual(0, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var5");
if (selection != null)
{
Assert.AreEqual(0, selection.ValueCodes.Count);
}
}
else
{
Assert.Fail();
}

}

[TestMethod]
public void ShouldReturnSelectionFor_Time_ContentWithTwoValues_OneMore()
{
PXModel model = GetPxModelDefaultSelection(3, 2); // Time, content and a third variable cannot be eliminated. Content has 2 values
VariablesSelection variablesSelection = new VariablesSelection();
variablesSelection.Selection = new List<VariableSelection>();
SelectionHandler selectionHandler = new SelectionHandler(GetConfigMock().Object);

Problem? problem;
var builderMock = new Mock<IPXModelBuilder>();
builderMock.Setup(x => x.Model).Returns(model);
Selection[]? selections = selectionHandler.GetSelection(builderMock.Object, variablesSelection, out problem);

if (selections != null)
{
Selection? selection = selections.FirstOrDefault(s => s.VariableCode == "Period");
if (selection != null)
{
Assert.AreEqual(1, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "Content");
if (selection != null)
{
Assert.AreEqual(2, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var3");
if (selection != null)
{
Assert.AreEqual(3, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var4");
if (selection != null)
{
Assert.AreEqual(0, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var5");
if (selection != null)
{
Assert.AreEqual(0, selection.ValueCodes.Count);
}
}
else
{
Assert.Fail();
}

}

[TestMethod]
public void ShouldReturnSelectionFor_AllVariables()
{
PXModel model = GetPxModelDefaultSelection(5, 2); // No variable can be eliminated. Content has 2 values
VariablesSelection variablesSelection = new VariablesSelection();
variablesSelection.Selection = new List<VariableSelection>();
SelectionHandler selectionHandler = new SelectionHandler(GetConfigMock().Object);

Problem? problem;
var builderMock = new Mock<IPXModelBuilder>();
builderMock.Setup(x => x.Model).Returns(model);
Selection[]? selections = selectionHandler.GetSelection(builderMock.Object, variablesSelection, out problem);

if (selections != null)
{
Selection? selection = selections.FirstOrDefault(s => s.VariableCode == "Period");
if (selection != null)
{
Assert.AreEqual(1, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "Content");
if (selection != null)
{
Assert.AreEqual(1, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var3");
if (selection != null)
{
Assert.AreEqual(3, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var4");
if (selection != null)
{
Assert.AreEqual(3, selection.ValueCodes.Count);
}

selection = selections.FirstOrDefault(s => s.VariableCode == "var5");
if (selection != null)
{
Assert.AreEqual(1, selection.ValueCodes.Count);
}
}
else
{
Assert.Fail();
}

}

[TestMethod]
public void ShouldReturnWildcardStarSelection()
Expand Down Expand Up @@ -423,102 +217,6 @@ public void ShouldReturnToSelection()

// Helper methods


private PXModel GetPxModelDefaultSelection(int nonElimVariables, int contentValues)
{
PXModel pxModel = new PXModel();

// Time
Variable timeVar = new Variable("Period", PlacementType.Heading);
timeVar.IsTime = true;
timeVar.Elimination = false;

timeVar.Values.Add(CreateValue("2017M10"));
timeVar.Values.Add(CreateValue("2017M11"));
timeVar.Values.Add(CreateValue("2017M12"));
timeVar.Values.Add(CreateValue("2018M01"));
timeVar.Values.Add(CreateValue("2018M02"));
timeVar.Values.Add(CreateValue("2018M03"));
timeVar.Values.Add(CreateValue("2018M04"));
timeVar.Values.Add(CreateValue("2018M05"));
timeVar.Values.Add(CreateValue("2018M06"));
timeVar.Values.Add(CreateValue("2018M07"));
timeVar.Values.Add(CreateValue("2018M08"));
timeVar.Values.Add(CreateValue("2018M09"));
timeVar.Values.Add(CreateValue("2018M10"));
timeVar.Values.Add(CreateValue("2018M11"));
timeVar.Values.Add(CreateValue("2018M12"));

pxModel.Meta.AddVariable(timeVar);

// Content
Variable contentVar = new Variable("Content", PlacementType.Stub);
contentVar.IsContentVariable = true;
contentVar.Elimination = false;

contentVar.Values.Add(CreateValue("CONTENT1"));
if (contentValues > 1)
{
contentVar.Values.Add(CreateValue("CONTENT2"));
}

pxModel.Meta.AddVariable(contentVar);


// Variable 3
Variable var3 = new Variable("var3", PlacementType.Stub);
if (nonElimVariables == 2)
{
var3.Elimination = true;
}
else
{
var3.Elimination = false;
}

var3.Values.Add(CreateValue("Value1"));
var3.Values.Add(CreateValue("Value2"));
var3.Values.Add(CreateValue("Value3"));

pxModel.Meta.AddVariable(var3);

// Variable 4
Variable var4 = new Variable("var4", PlacementType.Stub);
if (nonElimVariables == 2 || nonElimVariables == 3)
{
var4.Elimination = true;
}
else
{
var4.Elimination = false;
}

var4.Values.Add(CreateValue("ValueA"));
var4.Values.Add(CreateValue("ValueB"));
var4.Values.Add(CreateValue("ValueC"));

pxModel.Meta.AddVariable(var4);

// Variable 5
Variable var5 = new Variable("var5", PlacementType.Stub);
if (nonElimVariables < 4)
{
var5.Elimination = true;
}
else
{
var5.Elimination = false;
}

var5.Values.Add(CreateValue("ValXXXX"));
var5.Values.Add(CreateValue("ValXXXY"));
var5.Values.Add(CreateValue("ValXXXZ"));
var5.Values.Add(CreateValue("ValXXXZ"));

pxModel.Meta.AddVariable(var5);
return pxModel;
}

private PCAxis.Paxiom.Value CreateValue(string code)
{
PCAxis.Paxiom.Value value = new PCAxis.Paxiom.Value(code);
Expand Down
Loading