Skip to content
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

[template] Arguments substititation, class arguments checking, arguments in params duplication #41

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[template] Arguments substititation, class arguments checking, arguments in params duplication #41

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
952d33e
[template] Argument replacements, class arguments checking, arguments…
NikitaZotov Jan 29, 2023
ee6e77d
[test][template] Test case with equal constructions in template
NikitaZotov Jan 31, 2023
7e5f401
[docs] Apply changes
NikitaZotov Jan 31, 2023
8bdbfee
Review fixes
NikitaZotov Jan 31, 2023
5533f9f
Review fixes
NikitaZotov Jan 31, 2023
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
Prev Previous commit
Next Next commit
Review fixes
  • Loading branch information
@NikitaZotov
NikitaZotov committed Jan 31, 2023
commit 8bdbfee21c2a6e972154573c26246b8f425069b7
20 changes: 10 additions & 10 deletions problem-solver/cxx/inferenceModule/manager/TemplateManager.cpp
View file
Original file line number Diff line number Diff line change
@@ -22,9 +22,9 @@ std::vector<ScTemplateParams> TemplateManager::createTemplateParams(
ScAddr const & scTemplate,
ScAddrVector const & argumentList)
{
std::map<std::string, std::set<ScAddr, AddrComparator>> replacementsMultimap;
std::unordered_map<std::string, std::set<ScAddr, AddrComparator>> replacementsMultimap;

ScIterator3Ptr varIterator = context->Iterator3(scTemplate, ScType::EdgeAccessConstPosPerm, ScType::NodeVar);
ScIterator3Ptr const & varIterator = context->Iterator3(scTemplate, ScType::EdgeAccessConstPosPerm, ScType::NodeVar);
while (varIterator->Next())
{
ScAddr var = varIterator->Get(2);
@@ -34,34 +34,34 @@ std::vector<ScTemplateParams> TemplateManager::createTemplateParams(
{
ScIterator5Ptr const & classesIterator = context->Iterator5(
ScType::NodeConstClass, ScType::EdgeAccessVarPosPerm, var, ScType::EdgeAccessConstPosPerm, scTemplate);
bool isBelong = false;
bool isArgumentBelongToVarClasses = false;
while (classesIterator->Next())
{
ScAddr varClass = classesIterator->Get(0);
if (context->HelperCheckEdge(varClass, argument, ScType::EdgeAccessConstPosPerm))
{
isBelong = true;
isArgumentBelongToVarClasses = true;
}
else
{
isBelong = false;
isArgumentBelongToVarClasses = false;
break;
}
}

if (isBelong)
if (isArgumentBelongToVarClasses)
{
replacementsMultimap[varName].insert(argument);
}
}
}

std::vector<std::map<std::string, ScAddr>> paramsVector;
std::vector<std::unordered_map<std::string, ScAddr>> paramsVector;
paramsVector.reserve(replacementsMultimap.size());
for (auto const & pair : replacementsMultimap)
{
std::vector<std::map<std::string, ScAddr>> newParamsVector;
newParamsVector.reserve(replacementsMultimap.size());
std::vector<std::unordered_map<std::string, ScAddr>> newParamsVector;
newParamsVector.reserve(paramsVector.size() * pair.second.size());
for (auto const & addr : pair.second)
{
bool isUploaded = false;
@@ -87,7 +87,7 @@ std::vector<ScTemplateParams> TemplateManager::createTemplateParams(

if (!isUploaded)
{
std::map<std::string, ScAddr> map{{ pair.first, addr }};
std::unordered_map<std::string, ScAddr> map{{ pair.first, addr }};
newParamsVector.emplace_back(map);
}
}
41 changes: 25 additions & 16 deletions problem-solver/cxx/inferenceModule/test/units/TestTemplateSearchModule.cpp
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@

#include "searcher/TemplateSearcher.hpp"
#include "keynodes/InferenceKeynodes.hpp"
#include "manager/TemplateManager.hpp"

namespace inferenceTest
{
@@ -103,30 +104,38 @@ TEST_F(TemplateSearchManagerTest, SearchWithContent_MultipleResultTestCase)
searchResults[0][searchLinkIdentifier] == context.HelperFindBySystemIdtf(secondCorrectResultLinkIdentifier));
}

TEST_F(TemplateSearchManagerTest, SearchWithContent_EqualResultTestCase)
TEST_F(TemplateSearchManagerTest, Search_EqualResultTestCase)
{
std::string firstHuman = "human_ivan_ivanov";
std::string secondHuman = "human_pavel_ivanov";
std::string varHumanName1 = "_hum1";
std::string varHumanName3 = "_hum3";
std::string const & firstHumanIdtf = "human_ivan_ivanov";
std::string const & secondHumanIdtf = "human_pavel_ivanov";
std::string const & varHumanName1Idtf = "_hum1";
std::string const & varHumanName3Idtf = "_hum3";

ScMemoryContext & context = *m_ctx;

ScAddr const & firstHumanAddr = context.HelperFindBySystemIdtf(firstHumanIdtf);
ScAddr const & secondHumanAddr = context.HelperFindBySystemIdtf(secondHumanIdtf);

loader.loadScsFile(context, TEST_FILES_DIR_PATH + "searchWithContentEqualResultTestStucture.scs");
initialize();

ScAddr searchTemplateAddr = context.HelperFindBySystemIdtf(TEST_SEARCH_TEMPLATE_ID);
inference::TemplateSearcher templateSearcher = inference::TemplateSearcher(&context);
ScTemplateParams templateParams;
std::vector<ScTemplateSearchResultItem> searchResults =
templateSearcher.searchTemplate(searchTemplateAddr, templateParams);
ScAddr const & searchTemplateAddr = context.HelperFindBySystemIdtf(TEST_SEARCH_TEMPLATE_ID);
inference::TemplateManager templateManager = inference::TemplateManager(&context);
std::vector<ScTemplateParams> templateParamsVector = templateManager.createTemplateParams(searchTemplateAddr, {firstHumanAddr, secondHumanAddr});

EXPECT_EQ(searchResults.size(), 1);
EXPECT_TRUE(searchResults[0][varHumanName1] == context.HelperFindBySystemIdtf(firstHuman) ||
searchResults[0][varHumanName1] == context.HelperFindBySystemIdtf(secondHuman));
EXPECT_TRUE(searchResults[0][varHumanName3] == context.HelperFindBySystemIdtf(firstHuman) ||
searchResults[0][varHumanName3] == context.HelperFindBySystemIdtf(secondHuman));
EXPECT_FALSE(searchResults[0][varHumanName1] == searchResults[0][varHumanName3]);
inference::TemplateSearcher templateSearcher = inference::TemplateSearcher(&context);
for (ScTemplateParams const & templateParams : templateParamsVector)
{
std::vector<ScTemplateSearchResultItem> searchResults =
templateSearcher.searchTemplate(searchTemplateAddr, templateParams);

EXPECT_EQ(searchResults.size(), 1);
EXPECT_TRUE(searchResults[0][varHumanName1Idtf] == firstHumanAddr ||
searchResults[0][varHumanName1Idtf] == secondHumanAddr);
EXPECT_TRUE(searchResults[0][varHumanName3Idtf] == firstHumanAddr ||
searchResults[0][varHumanName3Idtf] == secondHumanAddr);
EXPECT_FALSE(searchResults[0][varHumanName1Idtf] == searchResults[0][varHumanName3Idtf]);
}
}

TEST_F(TemplateSearchManagerTest, SearchWithoutContent_NoStructuresTestCase)