diff --git a/CMakeLists.txt b/CMakeLists.txt index 460feffe..a26564d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,15 +15,16 @@ link_directories(${SC_BIN_PATH} ${SC_EXTENSIONS_DIRECTORY}) set(SC_MACHINE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/ostis-web-platform/sc-machine") set(CMAKE_MODULE_PATH "${SC_MACHINE_PATH}/cmake") -include("${CMAKE_MODULE_PATH}/codegen.cmake") if(${SC_CLANG_FORMAT_CODE}) include(${CMAKE_MODULE_PATH}/ClangFormat.cmake) endif() -set(SC_MEMORY_SRC "${SC_MACHINE_PATH}/sc-memory/") -set(SC_KPM_SRC "${SC_MACHINE_PATH}/sc-kpm/") -set(SC_TOOLS_SRC "${SC_MACHINE_PATH}/sc-tools/") +set(SC_MEMORY_SRC "${SC_MACHINE_PATH}/sc-memory/sc-memory/include") +set(SC_AGENTS_COMMON_PATH "${SC_MACHINE_PATH}/sc-kpm/sc-agents-common/include") +set(SC_CORE_PATH "${SC_MACHINE_PATH}/sc-memory/sc-core/include") +set(SC_BUILDER_PATH "${SC_MACHINE_PATH}/sc-tools/sc-builder/include") +set(SC_CONFIG_PATH "${SC_MACHINE_PATH}/sc-tools/sc-config/include") include("${CMAKE_CURRENT_SOURCE_DIR}/dependencies.cmake") sc_target_dependencies() diff --git a/dependencies.cmake b/dependencies.cmake index 1f9890ec..e646c8bc 100644 --- a/dependencies.cmake +++ b/dependencies.cmake @@ -9,8 +9,6 @@ macro(sc_target_dependencies) endmacro() macro(sc_linux_target_dependencies) - set(SC_CODEGEN_TOOL "${SC_BIN_PATH}/sc-code-generator") - find_package(nlohmann_json 3.2.0 REQUIRED) # for std::thread support diff --git a/docs/changelog.md b/docs/changelog.md index 35f15405..df8dcc75 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -24,3 +24,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated ### Removed +- Remove codegen for agents diff --git a/docs/images/translate_agent_input.png b/docs/images/translate_agent_input.png index 48e5490a..a91daf3d 100644 Binary files a/docs/images/translate_agent_input.png and b/docs/images/translate_agent_input.png differ diff --git a/ostis-metasystem.ini b/ostis-metasystem.ini index 94e41934..f18ea9fa 100644 --- a/ostis-metasystem.ini +++ b/ostis-metasystem.ini @@ -6,8 +6,8 @@ max_events_and_agents_threads = 32 dump_memory_period = 3600 dump_memory_statistics_period = 1800 -repo_path = kb.bin -extensions_path = bin/extensions +storage = kb.bin +extensions = bin/extensions log_type = Console log_file = sc-memory.log diff --git a/platform-dependent-components/problem-solver/cxx/.gitignore b/platform-dependent-components/problem-solver/cxx/.gitignore deleted file mode 100644 index 15284d40..00000000 --- a/platform-dependent-components/problem-solver/cxx/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -lib -**/generated diff --git a/platform-dependent-components/problem-solver/cxx/CMakeLists.txt b/platform-dependent-components/problem-solver/cxx/CMakeLists.txt index fea16570..a4195351 100755 --- a/platform-dependent-components/problem-solver/cxx/CMakeLists.txt +++ b/platform-dependent-components/problem-solver/cxx/CMakeLists.txt @@ -1,2 +1,3 @@ add_subdirectory(identifiers-module) add_subdirectory(sections-module) +add_subdirectory(verification-module) \ No newline at end of file diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/CMakeLists.txt b/platform-dependent-components/problem-solver/cxx/identifiers-module/CMakeLists.txt index 2a4a136c..40b29f80 100755 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/CMakeLists.txt +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/CMakeLists.txt @@ -3,7 +3,6 @@ set(IDENTIFIERS_MODULE_SRC "${CMAKE_CURRENT_LIST_DIR}") set(SOURCES "agent/translate_main_system_idtfs_from_sc_to_file_agent.cpp" "agent/translate_main_system_idtfs_from_sc_to_file_agent.hpp" - "keynodes/identifiers_keynodes.cpp" "keynodes/identifiers_keynodes.hpp" "identifiers_module.cpp" "identifiers_module.hpp" @@ -17,11 +16,12 @@ target_link_libraries(identifiers-module target_include_directories(identifiers-module PUBLIC ${IDENTIFIERS_MODULE_SRC} PUBLIC ${SC_MEMORY_SRC} + PUBLIC ${SC_CORE_PATH} + PUBLIC ${SC_AGENTS_COMMON_PATH} PUBLIC ${SC_KPM_SRC} + PUBLIC ${SC_BUILDER_PATH} ) -sc_codegen_ex(identifiers-module ${IDENTIFIERS_MODULE_SRC} ${IDENTIFIERS_MODULE_SRC}/generated) - if(${SC_CLANG_FORMAT_CODE}) target_clangformat_setup(identifiers-module) endif() diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/agent/translate_main_system_idtfs_from_sc_to_file_agent.cpp b/platform-dependent-components/problem-solver/cxx/identifiers-module/agent/translate_main_system_idtfs_from_sc_to_file_agent.cpp index 7897c024..1d41a186 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/agent/translate_main_system_idtfs_from_sc_to_file_agent.cpp +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/agent/translate_main_system_idtfs_from_sc_to_file_agent.cpp @@ -4,29 +4,20 @@ * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) */ -#include "sc-agents-common/utils/CommonUtils.hpp" -#include "sc-agents-common/utils/AgentUtils.hpp" #include "keynodes/identifiers_keynodes.hpp" #include "translate_main_system_idtfs_from_sc_to_file_agent.hpp" using namespace identifiersModule; -SC_AGENT_IMPLEMENTATION(TranslateMainSystemIdtfsFromScToFileAgent) +ScResult TranslateMainSystemIdtfsFromScToFileAgent::DoProgram(ScActionInitiatedEvent const & event, ScAction & action) { - ScAddr const & actionAddr = otherAddr; - - if (!CheckAction(actionAddr)) - return SC_RESULT_OK; - - SC_LOG_DEBUG("TranslateMainSystemIdtfsFromScToFileAgent started"); - - // TODO: replace by CoreKeynodes::nrel_system_identifier after release - ScAddr const & nrelSystemIdtf = m_memoryCtx.HelperFindBySystemIdtf("nrel_system_identifier"); + // TODO: replace by ScKeynodes::nrel_system_identifier after release + ScAddr const & nrelSystemIdtf = m_context.SearchElementBySystemIdentifier("nrel_system_identifier"); std::stringstream streamIdtfs; ScIterator3Ptr const & iterator3PtrEdgeBelongsToNrelSystemIdtf = - m_memoryCtx.Iterator3(nrelSystemIdtf, ScType::EdgeAccessConstPosPerm, ScType::EdgeDCommonConst); + m_context.CreateIterator3(nrelSystemIdtf, ScType::ConstPermPosArc, ScType::ConstCommonArc); ScAddr edgeBelongsToNrelSystemIdtf; ScAddr sourceOfEdgeBelongsToNrelSystemIdtf; @@ -38,24 +29,27 @@ SC_AGENT_IMPLEMENTATION(TranslateMainSystemIdtfsFromScToFileAgent) while (iterator3PtrEdgeBelongsToNrelSystemIdtf->Next()) { edgeBelongsToNrelSystemIdtf = iterator3PtrEdgeBelongsToNrelSystemIdtf->Get(2); - sourceOfEdgeBelongsToNrelSystemIdtf = m_memoryCtx.GetEdgeSource(edgeBelongsToNrelSystemIdtf); + sourceOfEdgeBelongsToNrelSystemIdtf = m_context.GetArcSourceElement(edgeBelongsToNrelSystemIdtf); try { - systemIdentifier = GetSystemIdtfAndVerifyNode(m_memoryCtx, sourceOfEdgeBelongsToNrelSystemIdtf); - mainIdentifier = GetMainIdtfAndVerifyNode(m_memoryCtx, sourceOfEdgeBelongsToNrelSystemIdtf); + systemIdentifier = GetSystemIdtfAndVerifyNode(m_context, sourceOfEdgeBelongsToNrelSystemIdtf); + mainIdentifier = GetMainIdtfAndVerifyNode(m_context, sourceOfEdgeBelongsToNrelSystemIdtf); stringType = GetStrScType(sourceOfEdgeBelongsToNrelSystemIdtf); if (!systemIdentifier.empty() && !mainIdentifier.empty() && !stringType.empty()) { - streamIdtfs << "{\"" << mainIdentifier << "\", " - << "{\"" << systemIdentifier << "\", \"" << stringType << "\"}},\n"; + streamIdtfs << R"({")" << mainIdentifier << R"(", )" + << R"({")" << systemIdentifier << R"(", ")" << stringType << R"("}},)" << "\n"; } } catch (utils::ScException const & exception) { SC_LOG_ERROR(exception.Description()); - utils::AgentUtils::finishAgentWork(&m_memoryCtx, actionAddr, false); - return SC_RESULT_ERROR; + + ScStructure result = m_context.GenerateStructure(); + result << action; + action.SetResult(result); + return action.FinishUnsuccessfully(); } } @@ -73,76 +67,73 @@ SC_AGENT_IMPLEMENTATION(TranslateMainSystemIdtfsFromScToFileAgent) bool const & resultOfWrite = WriteInFile(strIdtfs); if (resultOfWrite) - SC_LOG_DEBUG("File has been created"); + { + SC_AGENT_LOG_DEBUG("File has been created"); + return action.FinishSuccessfully(); + } else - SC_LOG_ERROR("File hasn't been created"); - utils::AgentUtils::finishAgentWork(&m_memoryCtx, actionAddr, resultOfWrite); - SC_LOG_DEBUG("TranslateMainSystemIdtfsFromScToFileAgent finished"); - return SC_RESULT_OK; + { + SC_AGENT_LOG_ERROR("File hasn't been created"); + return action.FinishUnsuccessfully(); + } } -bool TranslateMainSystemIdtfsFromScToFileAgent::CheckAction(ScAddr const & actionAddr) +ScAddr TranslateMainSystemIdtfsFromScToFileAgent::GetActionClass() const { - return m_memoryCtx.HelperCheckEdge( - IdentifiersKeynodes::action_find_identifiers, actionAddr, ScType::EdgeAccessConstPosPerm); + return IdentifiersKeynodes::action_find_identifiers; } std::string TranslateMainSystemIdtfsFromScToFileAgent::GetSystemIdtfAndVerifyNode( - ScMemoryContext & m_memoryCtx, + ScMemoryContext & m_context, ScAddr const & node) { std::string identifier; ScAddr identifierLink; - ScIterator5Ptr const & iterator5PtrCheckOnlyOneIdtf = m_memoryCtx.Iterator5( + ScIterator5Ptr const & iterator5PtrCheckOnlyOneIdtf = m_context.CreateIterator5( node, - ScType::EdgeDCommonConst, - ScType::LinkConst, - ScType::EdgeAccessConstPosPerm, - m_memoryCtx.HelperFindBySystemIdtf("nrel_system_identifier")); + ScType::ConstCommonArc, + ScType::ConstNodeLink, + ScType::ConstPermPosArc, + m_context.SearchElementBySystemIdentifier("nrel_system_identifier")); if (iterator5PtrCheckOnlyOneIdtf->Next()) { identifierLink = iterator5PtrCheckOnlyOneIdtf->Get(2); if (iterator5PtrCheckOnlyOneIdtf->Next()) SC_THROW_EXCEPTION(utils::ScException, "You have more than one system identifier for " + identifier); - m_memoryCtx.GetLinkContent(identifierLink, identifier); + m_context.GetLinkContent(identifierLink, identifier); } return identifier; } std::string TranslateMainSystemIdtfsFromScToFileAgent::GetMainIdtfAndVerifyNode( - ScMemoryContext & m_memoryCtx, + ScMemoryContext & m_context, ScAddr const & node) { std::string identifier; ScAddr mainIdentifierLink; ScAddr mainAnotherIdentifierLink; - ScIterator5Ptr const & iterator5PtrCheckOnlyOneIdtf = m_memoryCtx.Iterator5( - node, - ScType::EdgeDCommonConst, - ScType::LinkConst, - ScType::EdgeAccessConstPosPerm, - scAgentsCommon::CoreKeynodes::nrel_main_idtf); + ScIterator5Ptr const & iterator5PtrCheckOnlyOneIdtf = m_context.CreateIterator5( + node, ScType::ConstCommonArc, ScType::ConstNodeLink, ScType::ConstPermPosArc, ScKeynodes::nrel_main_idtf); bool isLangRu; while (iterator5PtrCheckOnlyOneIdtf->Next()) { mainIdentifierLink = iterator5PtrCheckOnlyOneIdtf->Get(2); - isLangRu = m_memoryCtx.HelperCheckEdge( - scAgentsCommon::CoreKeynodes::lang_ru, mainIdentifierLink, ScType::EdgeAccessConstPosPerm); + isLangRu = m_context.CheckConnector(ScKeynodes::lang_ru, mainIdentifierLink, ScType::ConstPermPosArc); if (isLangRu) { while (iterator5PtrCheckOnlyOneIdtf->Next()) { mainAnotherIdentifierLink = iterator5PtrCheckOnlyOneIdtf->Get(2); - isLangRu = m_memoryCtx.HelperCheckEdge( - scAgentsCommon::CoreKeynodes::lang_ru, mainAnotherIdentifierLink, ScType::EdgeAccessConstPosPerm); + isLangRu = + m_context.CheckConnector(ScKeynodes::lang_ru, mainAnotherIdentifierLink, ScType::ConstPermPosArc); if (isLangRu) return identifier; } - m_memoryCtx.GetLinkContent(mainIdentifierLink, identifier); + m_context.GetLinkContent(mainIdentifierLink, identifier); break; } } @@ -152,7 +143,7 @@ std::string TranslateMainSystemIdtfsFromScToFileAgent::GetMainIdtfAndVerifyNode( std::string TranslateMainSystemIdtfsFromScToFileAgent::GetStrScType(ScAddr const & node) { std::string strType; - ScType const & type = m_memoryCtx.GetElementType(node); + ScType const & type = m_context.GetElementType(node); if (ScTypesOfNodesWithSCsClasses.count(type)) strType = ScTypesOfNodesWithSCsClasses[type]; else if (ScTypesOfEdgesWithSCsClasses.count(type)) diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/agent/translate_main_system_idtfs_from_sc_to_file_agent.hpp b/platform-dependent-components/problem-solver/cxx/identifiers-module/agent/translate_main_system_idtfs_from_sc_to_file_agent.hpp index 47e99077..ae837154 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/agent/translate_main_system_idtfs_from_sc_to_file_agent.hpp +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/agent/translate_main_system_idtfs_from_sc_to_file_agent.hpp @@ -6,84 +6,77 @@ #pragma once -#include "sc-memory/kpm/sc_agent.hpp" -#include "sc-agents-common/keynodes/coreKeynodes.hpp" - -#include "translate_main_system_idtfs_from_sc_to_file_agent.generated.hpp" +#include namespace identifiersModule { -class TranslateMainSystemIdtfsFromScToFileAgent : public ScAgent +class TranslateMainSystemIdtfsFromScToFileAgent : public ScActionInitiatedAgent { - SC_CLASS(Agent, Event(scAgentsCommon::CoreKeynodes::question_initiated, ScEvent::Type::AddOutputEdge)) - SC_GENERATED_BODY() +public: + ScAddr GetActionClass() const override; + + ScResult DoProgram(ScActionInitiatedEvent const & event, ScAction & action) override; std::map ScTypesOfNodesWithSCsClasses = { {ScType::Const, "sc_node"}, {ScType::Var, "sc_node"}, {ScType::Node, "sc_node"}, - {ScType::Link, "sc_link"}, - {ScType::LinkClass, "sc_link"}, + {ScType::NodeLink, "sc_link"}, + {ScType::NodeLinkClass, "sc_link"}, {ScType::Unknown, "sc_node"}, - {ScType::NodeConst, "sc_node"}, - {ScType::NodeVar, "sc_node"}, + {ScType::ConstNode, "sc_node"}, + {ScType::VarNode, "sc_node"}, - {ScType::LinkConst, "sc_link"}, - {ScType::LinkVar, "sc_link"}, + {ScType::ConstNodeLink, "sc_link"}, + {ScType::VarNodeLink, "sc_link"}, - {ScType::NodeStruct, "sc_node_struct"}, + {ScType::NodeStructure, "sc_node_structure"}, {ScType::NodeTuple, "sc_node_tuple"}, {ScType::NodeRole, "sc_node_role_relation"}, - {ScType::NodeNoRole, "sc_node_norole_relation"}, + {ScType::NodeNonRole, "sc_node_non_role_relation"}, {ScType::NodeClass, "sc_node_class"}, - {ScType::NodeAbstract, "sc_node"}, + {ScType::NodeSuperclass, "sc_node_superclass"}, {ScType::NodeMaterial, "sc_node_material"}, - {ScType::NodeConstStruct, "sc_node_struct"}, - {ScType::NodeConstTuple, "sc_node_tuple"}, - {ScType::NodeConstRole, "sc_node_role_relation"}, - {ScType::NodeConstNoRole, "sc_node_norole_relation"}, - {ScType::NodeConstClass, "sc_node_class"}, - {ScType::NodeConstAbstract, "sc_node"}, - {ScType::NodeConstMaterial, "sc_node_material"}, - - {ScType::NodeVarStruct, "sc_node_struct"}, - {ScType::NodeVarTuple, "sc_node_tuple"}, - {ScType::NodeVarRole, "sc_node_role_relation"}, - {ScType::NodeVarNoRole, "sc_node_norole_relation"}, - {ScType::NodeVarClass, "sc_node_class"}, - {ScType::NodeVarAbstract, "sc_node"}, - {ScType::NodeVarMaterial, "sc_node_material"}}; + {ScType::ConstNodeStructure, "sc_node_structure"}, + {ScType::ConstNodeTuple, "sc_node_tuple"}, + {ScType::ConstNodeRole, "sc_node_role_relation"}, + {ScType::ConstNodeNonRole, "sc_node_non_role_relation"}, + {ScType::ConstNodeClass, "sc_node_class"}, + {ScType::ConstNodeMaterial, "sc_node_material"}, - std::map ScTypesOfEdgesWithSCsClasses = { - {ScType::EdgeUCommon, "sc_edge"}, - {ScType::EdgeDCommon, "sc_edge_common"}, - - {ScType::EdgeUCommonConst, "<=>"}, - {ScType::EdgeDCommonConst, "sc_edge_common"}, - - {ScType::EdgeAccess, "sc_edge_access"}, - - {ScType::EdgeAccessConstPosPerm, "sc_edge_main"}, - {ScType::EdgeAccessConstNegPerm, "sc_edge_main"}, - {ScType::EdgeAccessConstFuzPerm, "sc_edge_main"}, - {ScType::EdgeAccessConstPosTemp, "sc_edge_main"}, - {ScType::EdgeAccessConstNegTemp, "sc_edge_main"}, - {ScType::EdgeAccessConstFuzTemp, "sc_edge_main"}, - - {ScType::EdgeUCommonVar, "_<=>"}, - {ScType::EdgeDCommonVar, "sc_edge_common"}, - {ScType::EdgeAccessVarPosPerm, "sc_edge_main"}, - {ScType::EdgeAccessVarNegPerm, "sc_edge_main"}, - {ScType::EdgeAccessVarFuzPerm, "sc_edge_main"}, - {ScType::EdgeAccessVarPosTemp, "sc_edge_main"}, - {ScType::EdgeAccessVarNegTemp, "sc_edge_main"}, - {ScType::EdgeAccessVarFuzTemp, "sc_edge_main"}}; + {ScType::VarNodeStructure, "sc_node_structure"}, + {ScType::VarNodeTuple, "sc_node_tuple"}, + {ScType::VarNodeRole, "sc_node_role_relation"}, + {ScType::VarNodeNonRole, "sc_node_non_role_relation"}, + {ScType::VarNodeClass, "sc_node_class"}, + {ScType::VarNodeMaterial, "sc_node_material"}}; + std::map ScTypesOfEdgesWithSCsClasses = { + {ScType::CommonEdge, "sc_common_edge"}, + {ScType::CommonArc, "sc_common_arc"}, + {ScType::MembershipArc, "sc_membership_arc"}, + + {ScType::ConstCommonEdge, "sc_common_edge"}, + {ScType::ConstCommonArc, "sc_common_arc"}, + + {ScType::ConstPermPosArc, "sc_main_arc"}, + {ScType::ConstPermNegArc, "sc_main_arc"}, + {ScType::ConstTempPosArc, "sc_main_arc"}, + {ScType::ConstTempNegArc, "sc_main_arc"}, + + {ScType::VarCommonEdge, "sc_common_edge"}, + {ScType::VarCommonArc, "sc_main_arc"}, + {ScType::VarPosArc, "sc_main_arc"}, + {ScType::VarFuzArc, "sc_main_arc"}, + {ScType::VarPermNegArc, "sc_main_arc"}, + {ScType::VarTempPosArc, "sc_main_arc"}, + {ScType::VarTempNegArc, "sc_main_arc"}}; + private: - bool CheckAction(ScAddr const & actionAddr); + std::string GetStrScType(ScAddr const & node); static std::string GetSystemIdtfAndVerifyNode(ScMemoryContext & m_memoryCtx, ScAddr const & node); static std::string GetMainIdtfAndVerifyNode(ScMemoryContext & m_memoryCtx, ScAddr const & node); diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/identifiers_module.cpp b/platform-dependent-components/problem-solver/cxx/identifiers-module/identifiers_module.cpp index ab3d489b..8264efd5 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/identifiers_module.cpp +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/identifiers_module.cpp @@ -6,37 +6,12 @@ #include "identifiers_module.hpp" +#include "sc-memory/sc_memory.hpp" + #include "keynodes/identifiers_keynodes.hpp" + #include "agent/translate_main_system_idtfs_from_sc_to_file_agent.hpp" using namespace identifiersModule; -SC_IMPLEMENT_MODULE(IdentifiersModule) - -sc_result IdentifiersModule::InitializeImpl() -{ - if (!IdentifiersModule::InitGlobal()) - { - SC_LOG_ERROR("IdentifiersModule is deactivated"); - return SC_RESULT_ERROR; - } - - if (!IdentifiersKeynodes::InitGlobal()) - { - SC_LOG_ERROR("IdentifiersKeynodes is deactivated"); - return SC_RESULT_ERROR; - } - else - { - SC_AGENT_REGISTER(TranslateMainSystemIdtfsFromScToFileAgent); - } - - return SC_RESULT_OK; -} - -sc_result IdentifiersModule::ShutdownImpl() -{ - SC_AGENT_UNREGISTER(TranslateMainSystemIdtfsFromScToFileAgent); - - return SC_RESULT_OK; -} +SC_MODULE_REGISTER(IdentifiersModule)->Agent(); diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/identifiers_module.hpp b/platform-dependent-components/problem-solver/cxx/identifiers-module/identifiers_module.hpp index c6ef5e7f..bf5fd4ca 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/identifiers_module.hpp +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/identifiers_module.hpp @@ -8,19 +8,11 @@ #include "sc-memory/sc_module.hpp" -#include "identifiers_module.generated.hpp" - namespace identifiersModule { class IdentifiersModule : public ScModule { - SC_CLASS(LoadOrder(100)) - SC_GENERATED_BODY() - - sc_result InitializeImpl() override; - - sc_result ShutdownImpl() override; }; } // namespace identifiersModule diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/keynodes/identifiers_keynodes.hpp b/platform-dependent-components/problem-solver/cxx/identifiers-module/keynodes/identifiers_keynodes.hpp index b9c36f7d..5ef845fd 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/keynodes/identifiers_keynodes.hpp +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/keynodes/identifiers_keynodes.hpp @@ -6,22 +6,15 @@ #pragma once -#include "sc-memory/sc_addr.hpp" -#include "sc-memory/sc_object.hpp" - -#include "identifiers_keynodes.generated.hpp" +#include namespace identifiersModule { -class IdentifiersKeynodes : public ScObject +class IdentifiersKeynodes : public ScKeynodes { - SC_CLASS() - SC_GENERATED_BODY() - public: - SC_PROPERTY(Keynode("action_find_identifiers"), ForceCreate) - static ScAddr action_find_identifiers; + static inline ScKeynode const action_find_identifiers{"action_find_identifiers", ScType::ConstNodeClass}; }; } // namespace identifiersModule diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/correct_test.scs b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/correct_test.scs index 20253415..1c94f528 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/correct_test.scs +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/correct_test.scs @@ -1,6 +1,6 @@ test_action_node <- action_find_identifiers; - <- question;; + <- action;; knowledge <- sc_node_class; diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/incorrect_test.scs b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/incorrect_test.scs index 6e0f1f5c..c664c4a7 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/incorrect_test.scs +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/incorrect_test.scs @@ -1,6 +1,6 @@ test_action_node <- action_find_identifiers; - <- question;; + <- action;; Knowledge <- sc_node_class; diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/many_system_idtfs_test.scs b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/many_system_idtfs_test.scs index ab2220d3..72812741 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/many_system_idtfs_test.scs +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/many_system_idtfs_test.scs @@ -1,6 +1,6 @@ test_action_node <- action_find_identifiers; - <- question;; + <- action;; Knowledge <- sc_node_class; diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/void_test.scs b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/void_test.scs index ad0081a1..62a011d7 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/void_test.scs +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/test-structures/void_test.scs @@ -1,3 +1,3 @@ test_action_node <- action_find_identifiers; - <- question;; + <- action;; diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/tests.cmake b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/tests.cmake index fc5a3bfa..07b200cb 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/tests.cmake +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/tests.cmake @@ -1,7 +1,7 @@ make_tests_from_folder(${CMAKE_CURRENT_LIST_DIR}/units NAME identifiers-module-test-starter DEPENDS sc-memory sc-core sc-builder-lib identifiers-module - INCLUDES ${SC_MEMORY_SRC}/tests/sc-memory/_test ${SC_TOOLS_SRC} + INCLUDES ${SC_TOOLS_SRC} ${SC_MEMORY_SRC} ${SC_BUILDER_PATH} ) add_definitions(-DMODULE_TEST_SRC_PATH="${CMAKE_CURRENT_LIST_DIR}") diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/units/test.cpp b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/units/test.cpp index 0db48a19..269c0e48 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/test/units/test.cpp +++ b/platform-dependent-components/problem-solver/cxx/identifiers-module/test/units/test.cpp @@ -1,11 +1,11 @@ -#include "sc-builder/src/scs_loader.hpp" -#include "sc-memory/sc_wait.hpp" -#include "sc_test.hpp" +#include +#include +#include + #include "sc-agents-common/utils/CommonUtils.hpp" -#include "sc-agents-common/utils/AgentUtils.hpp" + #include "keynodes/identifiers_keynodes.hpp" #include "agent/translate_main_system_idtfs_from_sc_to_file_agent.hpp" -#include "sc-agents-common/keynodes/coreKeynodes.hpp" using namespace identifiersModule; using AgentTest = ScMemoryTest; @@ -13,16 +13,11 @@ using AgentTest = ScMemoryTest; namespace moduleTest { ScsLoader loader; + std::string const TEST_FILES_DIR_PATH = MODULE_TEST_SRC_PATH "/test-structures/"; int const WAIT_TIME = 1000; -void InitializeKeynodes() -{ - scAgentsCommon::CoreKeynodes::InitGlobal(); - IdentifiersKeynodes::InitGlobal(); -} - std::string GetFileContent() { char fileName[] = IDENTIFIERS_MODULE_PATH "identifiers.txt"; @@ -63,42 +58,33 @@ bool IsSubstringOfFile(std::vector const & input, std::string const TEST_F(AgentTest, VoidTest) { - ScMemoryContext & context = *m_ctx; - + ScAgentContext & context = *m_ctx; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "void_test.scs"); - ScAddr const & testActionNode = context.HelperFindBySystemIdtf("test_action_node"); - - ScAgentInit(true); - InitializeKeynodes(); + ScAddr const & testActionNode = context.SearchElementBySystemIdentifier("test_action_node"); + ScAction testAction = context.ConvertToAction(testActionNode); - SC_AGENT_REGISTER(TranslateMainSystemIdtfsFromScToFileAgent) + context.SubscribeAgent(); - EXPECT_TRUE(utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME)); - - EXPECT_TRUE(context.HelperCheckEdge( - scAgentsCommon::CoreKeynodes::question_finished_successfully, testActionNode, ScType::EdgeAccessConstPosPerm)); + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + EXPECT_TRUE(testAction.IsFinishedSuccessfully()); std::string const fileContent = GetFileContent(); EXPECT_TRUE(fileContent.empty()); - - SC_AGENT_UNREGISTER(TranslateMainSystemIdtfsFromScToFileAgent) + context.UnsubscribeAgent(); } TEST_F(AgentTest, CorrectTest) { - ScMemoryContext & context = *m_ctx; + ScAgentContext & context = *m_ctx; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "correct_test.scs"); - ScAddr const & testActionNode = context.HelperFindBySystemIdtf("test_action_node"); + ScAddr const & testActionNode = context.SearchElementBySystemIdentifier("test_action_node"); + ScAction testAction = context.ConvertToAction(testActionNode); - ScAgentInit(true); - InitializeKeynodes(); - SC_AGENT_REGISTER(TranslateMainSystemIdtfsFromScToFileAgent) + context.SubscribeAgent(); - EXPECT_TRUE(utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME)); - - EXPECT_TRUE(context.HelperCheckEdge( - scAgentsCommon::CoreKeynodes::question_finished_successfully, testActionNode, ScType::EdgeAccessConstPosPerm)); + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + EXPECT_TRUE(testAction.IsFinishedSuccessfully()); std::string const & space = R"({"space", "sc_node_class"})"; std::string const & knowledge = R"({"знание", {"knowledge", "sc_node_class"}})"; @@ -114,23 +100,20 @@ TEST_F(AgentTest, CorrectTest) bool const falseResult = IsSubstringOfFile(falseInput, fileContent); EXPECT_TRUE(!falseResult && trueResult); - SC_AGENT_UNREGISTER(TranslateMainSystemIdtfsFromScToFileAgent) + context.UnsubscribeAgent(); } TEST_F(AgentTest, IncorrectTest) { - ScMemoryContext & context = *m_ctx; + ScAgentContext & context = *m_ctx; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "incorrect_test.scs"); - ScAddr const & testActionNode = context.HelperFindBySystemIdtf("test_action_node"); - - ScAgentInit(true); - InitializeKeynodes(); - SC_AGENT_REGISTER(TranslateMainSystemIdtfsFromScToFileAgent) + ScAddr const & testActionNode = context.SearchElementBySystemIdentifier("test_action_node"); + ScAction testAction = context.ConvertToAction(testActionNode); - EXPECT_TRUE(utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME)); + context.SubscribeAgent(); - EXPECT_TRUE(context.HelperCheckEdge( - scAgentsCommon::CoreKeynodes::question_finished_successfully, testActionNode, ScType::EdgeAccessConstPosPerm)); + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + EXPECT_TRUE(testAction.IsFinishedSuccessfully()); std::string const fileContent = GetFileContent(); @@ -147,26 +130,21 @@ TEST_F(AgentTest, IncorrectTest) bool const falseResult = IsSubstringOfFile(falseInput, fileContent); EXPECT_TRUE(!falseResult && trueResult); - - SC_AGENT_UNREGISTER(TranslateMainSystemIdtfsFromScToFileAgent) + context.UnsubscribeAgent(); } TEST_F(AgentTest, ManySystemIdtfsTest) { - ScMemoryContext & context = *m_ctx; + ScAgentContext & context = *m_ctx; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "many_system_idtfs_test.scs"); - ScAddr const & testActionNode = context.HelperFindBySystemIdtf("test_action_node"); - - ScAgentInit(true); - InitializeKeynodes(); - SC_AGENT_REGISTER(TranslateMainSystemIdtfsFromScToFileAgent) - - EXPECT_TRUE(utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME)); + ScAddr const & testActionNode = context.SearchElementBySystemIdentifier("test_action_node"); + ScAction testAction = context.ConvertToAction(testActionNode); - EXPECT_TRUE(context.HelperCheckEdge( - scAgentsCommon::CoreKeynodes::question_finished_unsuccessfully, testActionNode, ScType::EdgeAccessConstPosPerm)); + context.SubscribeAgent(); + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + EXPECT_TRUE(testAction.IsFinishedUnsuccessfully()); - SC_AGENT_UNREGISTER(TranslateMainSystemIdtfsFromScToFileAgent) + context.UnsubscribeAgent(); } } // namespace moduleTest diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/CMakeLists.txt b/platform-dependent-components/problem-solver/cxx/sections-module/CMakeLists.txt index 569e3e30..e2b8bfa1 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/CMakeLists.txt +++ b/platform-dependent-components/problem-solver/cxx/sections-module/CMakeLists.txt @@ -21,7 +21,6 @@ set(SOURCES "builder/sections_builder.cpp" "constants/sections_aliases.cpp" "generator/sections_generator.cpp" - "keynodes/sections_keynodes.cpp" "utils/set_utils.cpp" "utils/sections_utils.cpp" ) @@ -34,11 +33,10 @@ target_link_libraries(sections-module target_include_directories(sections-module PUBLIC ${SECTIONS_MODULE_SRC} PUBLIC ${SC_MEMORY_SRC} - PUBLIC ${SC_KPM_SRC} + PUBLIC ${SC_CORE_PATH} + PUBLIC ${SC_AGENTS_COMMON_PATH} ) -sc_codegen_ex(sections-module ${SECTIONS_MODULE_SRC} ${SECTIONS_MODULE_SRC}/generated) - if(${SC_CLANG_FORMAT_CODE}) target_clangformat_setup(sections-module) endif() diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/agent/add_section_agent.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/agent/add_section_agent.cpp index 3330ebd6..69b4b852 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/agent/add_section_agent.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/agent/add_section_agent.cpp @@ -4,9 +4,6 @@ * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) */ -#include "sc-agents-common/keynodes/coreKeynodes.hpp" -#include "sc-agents-common/utils/AgentUtils.hpp" -#include "sc-agents-common/utils/IteratorUtils.hpp" #include "sc-agents-common/utils/GenerationUtils.hpp" #include "utils/set_utils.hpp" @@ -18,63 +15,47 @@ #include "add_section_agent.hpp" -using namespace scAgentsCommon; using namespace utils; namespace sectionsModule { -SC_AGENT_IMPLEMENTATION(AddSectionAgent) +ScResult AddSectionAgent::DoProgram(ScActionInitiatedEvent const & event, ScAction & action) { - ScAddr const & questionNode = m_memoryCtx.GetEdgeTarget(edgeAddr); - if (!CheckActionClass(questionNode)) - return SC_RESULT_OK; - - SC_LOG_DEBUG("AddSectionAgent started"); - - ScAddr sectionNameAddr = - IteratorUtils::getAnyByOutRelation(&m_memoryCtx, questionNode, scAgentsCommon::CoreKeynodes::rrel_1); - ScAddr parentSectionAddr = - IteratorUtils::getAnyByOutRelation(&m_memoryCtx, questionNode, scAgentsCommon::CoreKeynodes::rrel_2); - ScAddr langAddr = - IteratorUtils::getAnyByOutRelation(&m_memoryCtx, questionNode, scAgentsCommon::CoreKeynodes::rrel_3); - - if (!m_memoryCtx.IsElement(sectionNameAddr)) + auto const [sectionNameAddr, parentSectionAddr, langAddr] = action.GetArguments<3>(); + if (!m_context.IsElement(sectionNameAddr)) { - SC_LOG_ERROR("AddSectionAgent: section identifier link not found."); - utils::AgentUtils::finishAgentWork(&m_memoryCtx, questionNode, false); - return SC_RESULT_ERROR_INVALID_PARAMS; + SC_AGENT_LOG_ERROR("Section identifier link not found."); + return action.FinishUnsuccessfully(); } - if (!m_memoryCtx.IsElement(langAddr)) + if (!m_context.IsElement(langAddr)) { - SC_LOG_ERROR("AddSectionAgent: lang node not found."); - utils::AgentUtils::finishAgentWork(&m_memoryCtx, questionNode, false); - return SC_RESULT_ERROR_INVALID_PARAMS; + SC_AGENT_LOG_ERROR("Lang node not found."); + return action.FinishUnsuccessfully(); } std::string sectionName; - m_memoryCtx.GetLinkContent(sectionNameAddr, sectionName); - SC_LOG_DEBUG("AddSectionAgent: new section name is \"" + sectionName + "\"."); + m_context.GetLinkContent(sectionNameAddr, sectionName); + SC_AGENT_LOG_DEBUG(R"(New section name is ")" << sectionName << R"(".)"); ScAddr sectionAddr; - if (m_memoryCtx.IsElement(parentSectionAddr)) + if (m_context.IsElement(parentSectionAddr)) sectionAddr = GenerateSection(sectionName, parentSectionAddr, langAddr); else sectionAddr = GenerateSection(sectionName, langAddr); - if (!m_memoryCtx.IsElement(sectionAddr)) + if (!m_context.IsElement(sectionAddr)) { - SC_LOG_ERROR("AddSectionAgent: section is not generated."); - utils::AgentUtils::finishAgentWork(&m_memoryCtx, questionNode, false); - return SC_RESULT_ERROR; + SC_AGENT_LOG_ERROR("Section is not generated."); + return action.FinishUnsuccessfully(); } - - utils::AgentUtils::finishAgentWork(&m_memoryCtx, questionNode, (ScAddrVector){sectionAddr}, true); - SC_LOG_DEBUG("AddSectionAgent finished"); - return SC_RESULT_OK; + ScStructure result = m_context.GenerateStructure(); + result << sectionAddr; + action.SetResult(result); + return action.FinishSuccessfully(); } -bool AddSectionAgent::CheckActionClass(ScAddr const & actionNode) +ScAddr AddSectionAgent::GetActionClass() const { - return m_memoryCtx.HelperCheckEdge(SectionsKeynodes::action_add_section, actionNode, ScType::EdgeAccessConstPosPerm); + return SectionsKeynodes::action_add_section; } ScAddr AddSectionAgent::GenerateSection( @@ -82,63 +63,62 @@ ScAddr AddSectionAgent::GenerateSection( ScAddr const & parentSection, ScAddr const & lang) { - ScAddr decompositionTuple = sections_utils::GetSectionDecompositionTuple(&m_memoryCtx, parentSection); - if (!m_memoryCtx.IsElement(decompositionTuple)) + ScAddr decompositionTuple = sections_utils::GetSectionDecompositionTuple(&m_context, parentSection); + if (!m_context.IsElement(decompositionTuple)) return {}; - ScAddr newSection = sections_utils::FindSectionByName(&m_memoryCtx, sectionName); - if (!m_memoryCtx.IsElement(newSection)) - newSection = sections_generator::GenerateSection(&m_memoryCtx, sectionName, lang, true); + ScAddr newSection = sections_utils::FindSectionByName(&m_context, sectionName); + if (!m_context.IsElement(newSection)) + newSection = sections_generator::GenerateSection(&m_context, sectionName, lang, true); else { - if (m_memoryCtx.HelperCheckEdge(decompositionTuple, newSection, ScType::EdgeAccessConstPosPerm) + if (m_context.CheckConnector(decompositionTuple, newSection, ScType::ConstPermPosArc) || parentSection == newSection) return {}; } - ScAddr lastSection = sections_utils::GetLastSubSection(&m_memoryCtx, decompositionTuple); - ScAddr newSectionArc = m_memoryCtx.CreateEdge(ScType::EdgeAccessConstPosPerm, decompositionTuple, newSection); - if (m_memoryCtx.IsElement(lastSection)) + ScAddr lastSection = sections_utils::GetLastSubSection(&m_context, decompositionTuple); + ScAddr newSectionArc = m_context.GenerateConnector(ScType::ConstPermPosArc, decompositionTuple, newSection); + if (m_context.IsElement(lastSection)) { - SC_LOG_DEBUG( - "AddSectionAgent: last section system idtf is \"" + m_memoryCtx.HelperGetSystemIdtf(lastSection) + "\"."); - ScIterator5Ptr lastSectionIterator = m_memoryCtx.Iterator5( + SC_AGENT_LOG_DEBUG("Last section system identifier is \"" + m_context.GetElementSystemIdentifier(lastSection) + "\"."); + ScIterator5Ptr lastSectionIterator = m_context.CreateIterator5( decompositionTuple, - ScType::EdgeAccessConstPosPerm, + ScType::ConstPermPosArc, lastSection, - ScType::EdgeAccessConstPosTemp, + ScType::ConstTempPosArc, SectionsKeynodes::rrel_last); if (lastSectionIterator->Next()) { ScAddr previousSectionArc = lastSectionIterator->Get(1); ScAddr previousSectionTempArc = lastSectionIterator->Get(3); - m_memoryCtx.EraseElement(previousSectionTempArc); + m_context.EraseElement(previousSectionTempArc); utils::GenerationUtils::generateRelationBetween( - &m_memoryCtx, previousSectionArc, newSectionArc, CoreKeynodes::nrel_basic_sequence); - m_memoryCtx.CreateEdge(ScType::EdgeAccessConstPosTemp, SectionsKeynodes::rrel_last, newSectionArc); + &m_context, previousSectionArc, newSectionArc, ScKeynodes::nrel_basic_sequence); + m_context.GenerateConnector(ScType::ConstTempPosArc, SectionsKeynodes::rrel_last, newSectionArc); } } else { - SC_LOG_DEBUG("AddSectionAgent: added section is new."); - m_memoryCtx.CreateEdge(ScType::EdgeAccessConstPosPerm, CoreKeynodes::rrel_1, newSectionArc); - m_memoryCtx.CreateEdge(ScType::EdgeAccessConstPosTemp, SectionsKeynodes::rrel_last, newSectionArc); + SC_AGENT_LOG_DEBUG("Added section is new."); + m_context.GenerateConnector(ScType::ConstPermPosArc, ScKeynodes::rrel_1, newSectionArc); + m_context.GenerateConnector(ScType::ConstTempPosArc, SectionsKeynodes::rrel_last, newSectionArc); } - sectionsModule::SetUtils::AddToSets(&m_memoryCtx, parentSection, {SectionsKeynodes::non_atomic_section}); - sectionsModule::SetUtils::RemoveFromSets(&m_memoryCtx, parentSection, {SectionsKeynodes::atomic_section}); - sectionsModule::SetUtils::RemoveFromSets(&m_memoryCtx, newSection, {SectionsKeynodes::removed_section}); + sectionsModule::SetUtils::AddToSets(&m_context, parentSection, {SectionsKeynodes::non_atomic_section}); + sectionsModule::SetUtils::RemoveFromSets(&m_context, parentSection, {SectionsKeynodes::atomic_section}); + sectionsModule::SetUtils::RemoveFromSets(&m_context, newSection, {SectionsKeynodes::removed_section}); return newSection; } ScAddr AddSectionAgent::GenerateSection(std::string const & sectionName, ScAddr const & lang) { - ScAddr section = sections_utils::FindSectionByName(&m_memoryCtx, sectionName); - if (!m_memoryCtx.IsElement(section)) - section = sections_generator::GenerateSection(&m_memoryCtx, sectionName, lang, true); + ScAddr section = sections_utils::FindSectionByName(&m_context, sectionName); + if (!m_context.IsElement(section)) + section = sections_generator::GenerateSection(&m_context, sectionName, lang, true); else - sectionsModule::SetUtils::RemoveFromSets(&m_memoryCtx, section, {SectionsKeynodes::removed_section}); + sectionsModule::SetUtils::RemoveFromSets(&m_context, section, {SectionsKeynodes::removed_section}); return section; } diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/agent/add_section_agent.hpp b/platform-dependent-components/problem-solver/cxx/sections-module/agent/add_section_agent.hpp index 4a0e1487..82cb3a8a 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/agent/add_section_agent.hpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/agent/add_section_agent.hpp @@ -6,22 +6,18 @@ #pragma once -#include "sc-memory/kpm/sc_agent.hpp" - -#include "sc-agents-common/keynodes/coreKeynodes.hpp" - -#include "generated/add_section_agent.generated.hpp" +#include namespace sectionsModule { -class AddSectionAgent : public ScAgent +class AddSectionAgent : public ScActionInitiatedAgent { - SC_CLASS(Agent, Event(scAgentsCommon::CoreKeynodes::question_initiated, ScEvent::Type::AddOutputEdge)) - SC_GENERATED_BODY() +public: + ScAddr GetActionClass() const override; -private: - bool CheckActionClass(ScAddr const & actionNode); + ScResult DoProgram(ScActionInitiatedEvent const & event, ScAction & action) override; +private: ScAddr GenerateSection(std::string const & sectionName, ScAddr const & parentSection, ScAddr const & lang); ScAddr GenerateSection(std::string const & sectionName, ScAddr const & lang); diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/agent/get_decomposition_agent.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/agent/get_decomposition_agent.cpp index 4814a854..a6f03caa 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/agent/get_decomposition_agent.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/agent/get_decomposition_agent.cpp @@ -4,7 +4,6 @@ * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) */ -#include "sc-agents-common/utils/AgentUtils.hpp" #include "sc-agents-common/utils/CommonUtils.hpp" #include "sc-agents-common/utils/IteratorUtils.hpp" @@ -17,106 +16,91 @@ using namespace utils; namespace sectionsModule { -SC_AGENT_IMPLEMENTATION(GetDecompositionAgent) +ScResult GetDecompositionAgent::DoProgram(ScActionInitiatedEvent const & event, ScAction & action) { - ScAddr const questionNode = m_memoryCtx.GetEdgeTarget(edgeAddr); - if (!CheckActionClass(questionNode)) - return SC_RESULT_OK; + size_t level = 1; - SC_LOG_INFO("GetDecompositionAgent started"); + auto [subjDomainAddr, levelAddr, langAddr, decompositionAddr] = action.GetArguments<4>(); - size_t level = 1; - ScAddr const subjDomainAddr = - IteratorUtils::getAnyByOutRelation(&m_memoryCtx, questionNode, scAgentsCommon::CoreKeynodes::rrel_1); - ScAddr const levelAddr = - IteratorUtils::getAnyByOutRelation(&m_memoryCtx, questionNode, scAgentsCommon::CoreKeynodes::rrel_2); - ScAddr const langAddr = - IteratorUtils::getAnyByOutRelation(&m_memoryCtx, questionNode, scAgentsCommon::CoreKeynodes::rrel_3); - ScAddr decompositionAddr = - IteratorUtils::getAnyByOutRelation(&m_memoryCtx, questionNode, scAgentsCommon::CoreKeynodes::rrel_4); - - if (!m_memoryCtx.IsElement(subjDomainAddr)) + if (!m_context.IsElement(subjDomainAddr)) { - SC_LOG_ERROR("GetDecompositionAgent: subject domain node not found."); - utils::AgentUtils::finishAgentWork(&m_memoryCtx, questionNode, false); - return SC_RESULT_ERROR_INVALID_PARAMS; + SC_AGENT_LOG_ERROR("Subject domain node not found."); + return action.FinishUnsuccessfully(); } - if (m_memoryCtx.IsElement(levelAddr)) - m_memoryCtx.GetLinkContent(levelAddr, level); - if (!m_memoryCtx.IsElement(langAddr)) + if (m_context.IsElement(levelAddr)) + m_context.GetLinkContent(levelAddr, level); + if (!m_context.IsElement(langAddr)) { - SC_LOG_ERROR("GetDecompositionAgent: language node not found."); - utils::AgentUtils::finishAgentWork(&m_memoryCtx, questionNode, false); - return SC_RESULT_ERROR_INVALID_PARAMS; + SC_AGENT_LOG_ERROR("Language node not found."); + return action.FinishUnsuccessfully(); } - if (!m_memoryCtx.IsElement(decompositionAddr)) + if (!m_context.IsElement(decompositionAddr)) { decompositionAddr = SectionsKeynodes::nrel_section_decomposition; - SC_LOG_DEBUG( - "GetDecompositionAgent: decomposition relation node not found. By default, " - << m_memoryCtx.HelperGetSystemIdtf(decompositionAddr) << " is used."); + SC_AGENT_LOG_DEBUG( + "Decomposition relation node not found. By default, " << m_context.GetElementSystemIdentifier(decompositionAddr) + << " is used."); } - ScAddr answerLink = m_memoryCtx.CreateLink(); + ScAddr answerLink = m_context.GenerateLink(); ScAddrVector decomposition = GetDecomposition(subjDomainAddr, decompositionAddr); json answerJSON{ {CommonUtils::getAddrHashString(subjDomainAddr), - {{"idtf", CommonUtils::getMainIdtf(&m_memoryCtx, subjDomainAddr, {langAddr})}, + {{"idtf", CommonUtils::getMainIdtf(&m_context, subjDomainAddr, {langAddr})}, {"decomposition", GetJSONDecomposition(decomposition, level, langAddr, decompositionAddr)}, {"position", 0}}}}; std::string answerJSONContent = answerJSON.dump(); - SC_LOG_INFO("Result decomposition: " << answerJSONContent); - m_memoryCtx.SetLinkContent(answerLink, answerJSONContent); + SC_AGENT_LOG_INFO("Result decomposition: " << answerJSONContent); + m_context.SetLinkContent(answerLink, answerJSONContent); - ScAddrVector answerElements = {answerLink}; + ScStructure result = m_context.GenerateStructure(); + result << answerLink; + action.SetResult(result); - utils::AgentUtils::finishAgentWork(&m_memoryCtx, questionNode, answerElements, true); - SC_LOG_INFO("GetDecompositionAgent finished"); - return SC_RESULT_OK; + return action.FinishSuccessfully(); } -bool GetDecompositionAgent::CheckActionClass(ScAddr const & actionNode) +ScAddr GetDecompositionAgent::GetActionClass() const { - return m_memoryCtx.HelperCheckEdge( - SectionsKeynodes::action_get_decomposition, actionNode, ScType::EdgeAccessConstPosPerm); + return SectionsKeynodes::action_get_decomposition; } ScAddrVector GetDecompositionAgent::GetDecomposition(ScAddr const & subjDomainAddr, ScAddr const & decompositionAddr) { - SC_LOG_DEBUG("GetDecompositionAgent: main section is " << m_memoryCtx.HelperGetSystemIdtf(subjDomainAddr) << "."); + SC_AGENT_LOG_DEBUG("Main section is " << m_context.GetElementSystemIdentifier(subjDomainAddr) << "."); ScAddrVector decomposition; ScTemplate decompositionTemplate; decompositionTemplate.Quintuple( subjDomainAddr, - ScType::EdgeDCommonVar, - ScType::NodeVar >> sections_aliases::DECOMPOSITION_TUPLE, - ScType::EdgeAccessVarPosPerm, + ScType::VarCommonArc, + ScType::VarNode >> sections_aliases::DECOMPOSITION_TUPLE, + ScType::VarPermPosArc, decompositionAddr); decompositionTemplate.Quintuple( sections_aliases::DECOMPOSITION_TUPLE, - ScType::EdgeAccessVarPosPerm, - ScType::NodeVar >> sections_aliases::SECTION_NODE, - ScType::EdgeAccessVarPosPerm, - scAgentsCommon::CoreKeynodes::rrel_1); + ScType::VarPermPosArc, + ScType::VarNode >> sections_aliases::SECTION_NODE, + ScType::VarPermPosArc, + ScKeynodes::rrel_1); ScTemplateSearchResult result; - m_memoryCtx.HelperSearchTemplate(decompositionTemplate, result); + m_context.SearchByTemplate(decompositionTemplate, result); if (!result.IsEmpty()) { ScAddr tupleNode = result[0][sections_aliases::DECOMPOSITION_TUPLE]; ScAddr subSection = result[0][sections_aliases::SECTION_NODE]; - SC_LOG_DEBUG("GetDecompositionAgent: subsection is " << m_memoryCtx.HelperGetSystemIdtf(subSection) << "."); + SC_AGENT_LOG_DEBUG("Subsection is " << m_context.GetElementSystemIdentifier(subSection) << "."); decomposition.push_back(subSection); - ScAddr nextSubSection = utils::IteratorUtils::getNextFromSet(&m_memoryCtx, tupleNode, subSection); - while (m_memoryCtx.IsElement(nextSubSection)) + ScAddr nextSubSection = utils::IteratorUtils::getNextFromSet(&m_context, tupleNode, subSection); + while (m_context.IsElement(nextSubSection)) { decomposition.push_back(nextSubSection); subSection = nextSubSection; - SC_LOG_DEBUG("GetDecompositionAgent: subsection is " << m_memoryCtx.HelperGetSystemIdtf(subSection) << "."); - nextSubSection = utils::IteratorUtils::getNextFromSet(&m_memoryCtx, tupleNode, subSection); + SC_AGENT_LOG_DEBUG("Subsection is " << m_context.GetElementSystemIdentifier(subSection) << "."); + nextSubSection = utils::IteratorUtils::getNextFromSet(&m_context, tupleNode, subSection); } } return decomposition; @@ -133,7 +117,7 @@ json GetDecompositionAgent::GetJSONDecomposition( { json item; item["position"] = index; - item["idtf"] = CommonUtils::getMainIdtf(&m_memoryCtx, decomposition[index], {langAddr}); + item["idtf"] = CommonUtils::getMainIdtf(&m_context, decomposition[index], {langAddr}); if (level != 1) item["decomposition"] = GetJSONDecomposition( GetDecomposition(decomposition[index], decompositionAddr), level - 1, langAddr, decompositionAddr); diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/agent/get_decomposition_agent.hpp b/platform-dependent-components/problem-solver/cxx/sections-module/agent/get_decomposition_agent.hpp index 3b672568..ae9a44d9 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/agent/get_decomposition_agent.hpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/agent/get_decomposition_agent.hpp @@ -6,26 +6,21 @@ #pragma once -#include "sc-memory/kpm/sc_agent.hpp" - +#include #include -#include "sc-agents-common/keynodes/coreKeynodes.hpp" - -#include "generated/get_decomposition_agent.generated.hpp" - using json = nlohmann::json; namespace sectionsModule { -class GetDecompositionAgent : public ScAgent +class GetDecompositionAgent : public ScActionInitiatedAgent { - SC_CLASS(Agent, Event(scAgentsCommon::CoreKeynodes::question_initiated, ScEvent::Type::AddOutputEdge)) - SC_GENERATED_BODY() +public: + ScAddr GetActionClass() const override; -private: - bool CheckActionClass(ScAddr const & actionNode); + ScResult DoProgram(ScActionInitiatedEvent const & event, ScAction & action) override; +private: json GetJSONDecomposition(ScAddrVector const &, size_t, ScAddr const &, ScAddr const &); ScAddrVector GetDecomposition(ScAddr const &, ScAddr const &); diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/agent/remove_section_agent.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/agent/remove_section_agent.cpp index d1c55952..eeee94e3 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/agent/remove_section_agent.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/agent/remove_section_agent.cpp @@ -4,8 +4,6 @@ * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) */ -#include "sc-agents-common/keynodes/coreKeynodes.hpp" -#include "sc-agents-common/utils/AgentUtils.hpp" #include "sc-agents-common/utils/CommonUtils.hpp" #include "sc-agents-common/utils/IteratorUtils.hpp" #include "sc-agents-common/utils/GenerationUtils.hpp" @@ -18,65 +16,53 @@ #include "remove_section_agent.hpp" -using namespace scAgentsCommon; using namespace utils; namespace sectionsModule { -SC_AGENT_IMPLEMENTATION(RemoveSectionAgent) +ScResult RemoveSectionAgent::DoProgram(ScActionInitiatedEvent const & event, ScAction & action) { - ScAddr const & questionNode = m_memoryCtx.GetEdgeTarget(edgeAddr); - if (!CheckActionClass(questionNode)) - return SC_RESULT_OK; + ScAddr sectionAddr = IteratorUtils::getAnyByOutRelation(&m_context, action, ScKeynodes::rrel_1); + ScAddr parentSectionAddr = IteratorUtils::getAnyByOutRelation(&m_context, action, ScKeynodes::rrel_2); - SC_LOG_DEBUG("RemoveSectionAgent started"); - - ScAddr sectionAddr = - IteratorUtils::getAnyByOutRelation(&m_memoryCtx, questionNode, scAgentsCommon::CoreKeynodes::rrel_1); - ScAddr parentSectionAddr = - IteratorUtils::getAnyByOutRelation(&m_memoryCtx, questionNode, scAgentsCommon::CoreKeynodes::rrel_2); - - if (!m_memoryCtx.IsElement(sectionAddr)) + if (!m_context.IsElement(sectionAddr)) { - SC_LOG_ERROR("RemoveSectionAgent: section node not found."); - utils::AgentUtils::finishAgentWork(&m_memoryCtx, questionNode, false); - return SC_RESULT_ERROR_INVALID_PARAMS; + SC_AGENT_LOG_ERROR("Section node not found."); + return action.FinishUnsuccessfully(); } - bool result = m_memoryCtx.IsElement(parentSectionAddr) ? RemoveSection(sectionAddr, parentSectionAddr) - : RemoveSection(sectionAddr); - if (!result) + bool isSuccess = m_context.IsElement(parentSectionAddr) ? RemoveSection(sectionAddr, parentSectionAddr) + : RemoveSection(sectionAddr); + if (!isSuccess) { - SC_LOG_ERROR("RemoveSectionAgent: error in the section deletion."); - utils::AgentUtils::finishAgentWork(&m_memoryCtx, questionNode, false); - return SC_RESULT_ERROR_INVALID_PARAMS; + SC_AGENT_LOG_ERROR("Error in the section deletion."); + return action.FinishUnsuccessfully(); } - utils::AgentUtils::finishAgentWork(&m_memoryCtx, questionNode, (ScAddrVector){sectionAddr}, true); - SC_LOG_DEBUG("RemoveSectionAgent finished"); - return SC_RESULT_OK; + ScStructure result = m_context.GenerateStructure(); + result << sectionAddr; + action.SetResult(result); + return action.FinishSuccessfully(); } -bool RemoveSectionAgent::CheckActionClass(ScAddr const & actionNode) +ScAddr RemoveSectionAgent::GetActionClass() const { - return m_memoryCtx.HelperCheckEdge( - SectionsKeynodes::action_remove_section, actionNode, ScType::EdgeAccessConstPosPerm); + return SectionsKeynodes::action_remove_section; } bool RemoveSectionAgent::RemoveSection(ScAddr const & section, ScAddr const & parentSection) { - SC_LOG_DEBUG("RemoveSectionAgent: section system idtf is " + m_memoryCtx.HelperGetSystemIdtf(section) + "."); - SC_LOG_DEBUG( - "RemoveSectionAgent: parent section system idtf is " + m_memoryCtx.HelperGetSystemIdtf(parentSection) + "."); + SC_AGENT_LOG_DEBUG("Section system idtf is " + m_context.GetElementSystemIdentifier(section) + "."); + SC_AGENT_LOG_DEBUG("Parent section system idtf is " + m_context.GetElementSystemIdentifier(parentSection) + "."); ScTemplate scTemplate; sections_builder::buildDecompositionTupleTemplate(scTemplate, parentSection, section); ScTemplateSearchResult searchResult; - m_memoryCtx.HelperSearchTemplate(scTemplate, searchResult); + m_context.SearchByTemplate(scTemplate, searchResult); if (!searchResult.IsEmpty()) { HandleSection(searchResult[0], section); HandleParentSection(searchResult[0], parentSection); - sectionsModule::SetUtils::AddToSets(&m_memoryCtx, section, {SectionsKeynodes::removed_section}); + sectionsModule::SetUtils::AddToSets(&m_context, section, {SectionsKeynodes::removed_section}); return true; } @@ -85,29 +71,27 @@ bool RemoveSectionAgent::RemoveSection(ScAddr const & section, ScAddr const & pa bool RemoveSectionAgent::RemoveSection(ScAddr const & section) { - SC_LOG_DEBUG("RemoveSectionAgent: section system idtf is " << m_memoryCtx.HelperGetSystemIdtf(section) << "."); + SC_AGENT_LOG_DEBUG("Section system idtf is " << m_context.GetElementSystemIdentifier(section) << "."); ScTemplate scTemplate; sections_builder::buildDecompositionTupleTemplate(scTemplate, section); ScTemplateSearchResult searchResult; - m_memoryCtx.HelperSearchTemplate(scTemplate, searchResult); + m_context.SearchByTemplate(scTemplate, searchResult); if (!searchResult.IsEmpty()) { for (size_t i = 0; i < searchResult.Size(); i++) { ScAddr parentSection = searchResult[i][sections_aliases::PARENT_SECTION]; - SC_LOG_DEBUG( - "RemoveSectionAgent: parent section system idtf is " << m_memoryCtx.HelperGetSystemIdtf(parentSection) - << "."); + SC_AGENT_LOG_DEBUG("Parent section system idtf is " << m_context.GetElementSystemIdentifier(parentSection) << "."); HandleSection(searchResult[i], section); HandleParentSection(searchResult[i], parentSection); } - sectionsModule::SetUtils::AddToSets(&m_memoryCtx, section, {SectionsKeynodes::removed_section}); + sectionsModule::SetUtils::AddToSets(&m_context, section, {SectionsKeynodes::removed_section}); return true; } - ScAddr edge = m_memoryCtx.CreateEdge(ScType::EdgeAccessConstPosPerm, SectionsKeynodes::removed_section, section); - return m_memoryCtx.IsElement(edge); + ScAddr edge = m_context.GenerateConnector(ScType::ConstPermPosArc, SectionsKeynodes::removed_section, section); + return m_context.IsElement(edge); } void RemoveSectionAgent::HandleSection(ScTemplateSearchResultItem const & searchResult, ScAddr const & section) @@ -123,11 +107,11 @@ void RemoveSectionAgent::HandleParentSection( { ScAddr tuple = searchResult[sections_aliases::DECOMPOSITION_TUPLE]; - if (CommonUtils::getSetPower(&m_memoryCtx, tuple) == 0) + if (CommonUtils::getSetPower(&m_context, tuple) == 0) { - m_memoryCtx.EraseElement(tuple); - sectionsModule::SetUtils::AddToSets(&m_memoryCtx, parentSection, {SectionsKeynodes::atomic_section}); - sectionsModule::SetUtils::RemoveFromSets(&m_memoryCtx, parentSection, {SectionsKeynodes::non_atomic_section}); + m_context.EraseElement(tuple); + sectionsModule::SetUtils::AddToSets(&m_context, parentSection, {SectionsKeynodes::atomic_section}); + sectionsModule::SetUtils::RemoveFromSets(&m_context, parentSection, {SectionsKeynodes::non_atomic_section}); } } @@ -136,7 +120,7 @@ void RemoveSectionAgent::HandleNeighboringSections(ScAddr const & tuple, ScAddr ScTemplate previousSectionTemplate; sections_builder::buildPreviousSectionTemplate(previousSectionTemplate, tuple, section); ScTemplateSearchResult previousSectionSearchResult; - m_memoryCtx.HelperSearchTemplate(previousSectionTemplate, previousSectionSearchResult); + m_context.SearchByTemplate(previousSectionTemplate, previousSectionSearchResult); ScAddr currentSectionEdge; ScAddr previousSection; @@ -146,15 +130,14 @@ void RemoveSectionAgent::HandleNeighboringSections(ScAddr const & tuple, ScAddr previousSection = previousSectionSearchResult[0][sections_aliases::SECTION_NODE]; previousSectionEdge = previousSectionSearchResult[0][sections_aliases::PREVIOUS_SECTION_ARC]; currentSectionEdge = previousSectionSearchResult[0][sections_aliases::SECTION_EDGE]; - SC_LOG_DEBUG( - "RemoveSectionAgent: previous neighboring section system idtf is " - + m_memoryCtx.HelperGetSystemIdtf(previousSection) + "."); + SC_AGENT_LOG_DEBUG( + "Previous neighboring section system idtf is " + m_context.GetElementSystemIdentifier(previousSection) + "."); } ScTemplate nextSectionTemplate; sections_builder::buildNextSectionTemplate(nextSectionTemplate, tuple, section); ScTemplateSearchResult nextSectionSearchResult; - m_memoryCtx.HelperSearchTemplate(nextSectionTemplate, nextSectionSearchResult); + m_context.SearchByTemplate(nextSectionTemplate, nextSectionSearchResult); ScAddr nextSection; ScAddr nextSectionEdge; @@ -163,39 +146,39 @@ void RemoveSectionAgent::HandleNeighboringSections(ScAddr const & tuple, ScAddr nextSection = nextSectionSearchResult[0][sections_aliases::SECTION_NODE]; nextSectionEdge = nextSectionSearchResult[0][sections_aliases::NEXT_SECTION_ARC]; currentSectionEdge = nextSectionSearchResult[0][sections_aliases::SECTION_EDGE]; - SC_LOG_DEBUG( - "RemoveSectionAgent: next neighboring section system idtf is " << m_memoryCtx.HelperGetSystemIdtf(nextSection) - << "."); + SC_AGENT_LOG_DEBUG( + "Next neighboring section system idtf is " << m_context.GetElementSystemIdentifier(nextSection) << "."); } // If current element is the first and the last - if (!m_memoryCtx.IsElement(currentSectionEdge)) + if (!m_context.IsElement(currentSectionEdge)) { - ScIterator3Ptr currentSectionEdgeIterator = m_memoryCtx.Iterator3(tuple, ScType::EdgeAccessConstPosPerm, section); + ScIterator3Ptr currentSectionEdgeIterator = + m_context.CreateIterator3(tuple, ScType::ConstPermPosArc, section); if (currentSectionEdgeIterator->Next()) { currentSectionEdge = currentSectionEdgeIterator->Get(1); } } - m_memoryCtx.EraseElement(currentSectionEdge); + m_context.EraseElement(currentSectionEdge); // If current element has previous and has next - if (m_memoryCtx.IsElement(previousSection) && m_memoryCtx.IsElement(nextSection)) + if (m_context.IsElement(previousSection) && m_context.IsElement(nextSection)) { GenerationUtils::generateRelationBetween( - &m_memoryCtx, previousSectionEdge, nextSectionEdge, CoreKeynodes::nrel_basic_sequence); + &m_context, previousSectionEdge, nextSectionEdge, ScKeynodes::nrel_basic_sequence); } // If current element is the last - if (m_memoryCtx.IsElement(previousSection) && !m_memoryCtx.IsElement(nextSection)) + if (m_context.IsElement(previousSection) && !m_context.IsElement(nextSection)) { - m_memoryCtx.CreateEdge(ScType::EdgeAccessConstPosTemp, SectionsKeynodes::rrel_last, previousSectionEdge); + m_context.GenerateConnector(ScType::ConstTempPosArc, SectionsKeynodes::rrel_last, previousSectionEdge); } // If current element is the first - if (!m_memoryCtx.IsElement(previousSection) && m_memoryCtx.IsElement(nextSection)) + if (!m_context.IsElement(previousSection) && m_context.IsElement(nextSection)) { - m_memoryCtx.CreateEdge(ScType::EdgeAccessConstPosPerm, CoreKeynodes::rrel_1, nextSectionEdge); + m_context.GenerateConnector(ScType::ConstPermPosArc, ScKeynodes::rrel_1, nextSectionEdge); } } diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/agent/remove_section_agent.hpp b/platform-dependent-components/problem-solver/cxx/sections-module/agent/remove_section_agent.hpp index 029a0204..9fa1a079 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/agent/remove_section_agent.hpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/agent/remove_section_agent.hpp @@ -6,22 +6,18 @@ #pragma once -#include "sc-memory/kpm/sc_agent.hpp" - -#include "sc-agents-common/keynodes/coreKeynodes.hpp" - -#include "generated/remove_section_agent.generated.hpp" +#include namespace sectionsModule { -class RemoveSectionAgent : public ScAgent +class RemoveSectionAgent : public ScActionInitiatedAgent { - SC_CLASS(Agent, Event(scAgentsCommon::CoreKeynodes::question_initiated, ScEvent::Type::AddOutputEdge)) - SC_GENERATED_BODY() +public: + ScAddr GetActionClass() const override; -private: - bool CheckActionClass(ScAddr const & actionNode); + ScResult DoProgram(ScActionInitiatedEvent const & event, ScAction & action) override; +private: bool RemoveSection(ScAddr const & section, ScAddr const & parentSection); bool RemoveSection(ScAddr const & section); diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/builder/sections_builder.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/builder/sections_builder.cpp index 58d4fbfd..82aa91ac 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/builder/sections_builder.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/builder/sections_builder.cpp @@ -4,8 +4,6 @@ * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) */ -#include "sc-agents-common/keynodes/coreKeynodes.hpp" - #include "constants/sections_aliases.hpp" #include "keynodes/sections_keynodes.hpp" @@ -20,26 +18,26 @@ void sections_builder::buildDecompositionTupleTemplate( { scTemplate.Quintuple( parentSection, - ScType::EdgeDCommonVar, - ScType::NodeVar >> sections_aliases::DECOMPOSITION_TUPLE, - ScType::EdgeAccessVarPosPerm, + ScType::VarCommonArc, + ScType::VarNode >> sections_aliases::DECOMPOSITION_TUPLE, + ScType::VarPermPosArc, SectionsKeynodes::nrel_entity_decomposition); scTemplate.Triple( sections_aliases::DECOMPOSITION_TUPLE, - ScType::EdgeAccessVarPosPerm >> sections_aliases::EDGE_TO_DELETE, + ScType::VarPermPosArc >> sections_aliases::EDGE_TO_DELETE, childSection); } void sections_builder::buildDecompositionTupleTemplate(ScTemplate & scTemplate, ScAddr const & section) { scTemplate.Quintuple( - ScType::NodeVar >> sections_aliases::PARENT_SECTION, - ScType::EdgeDCommonVar, - ScType::NodeVar >> sections_aliases::DECOMPOSITION_TUPLE, - ScType::EdgeAccessVarPosPerm, + ScType::VarNode >> sections_aliases::PARENT_SECTION, + ScType::VarCommonArc, + ScType::VarNode >> sections_aliases::DECOMPOSITION_TUPLE, + ScType::VarPermPosArc, SectionsKeynodes::nrel_entity_decomposition); scTemplate.Triple( - sections_aliases::DECOMPOSITION_TUPLE, ScType::EdgeAccessVarPosPerm >> sections_aliases::EDGE_TO_DELETE, section); + sections_aliases::DECOMPOSITION_TUPLE, ScType::VarPermPosArc >> sections_aliases::EDGE_TO_DELETE, section); } void sections_builder::buildNextSectionTemplate( @@ -47,17 +45,17 @@ void sections_builder::buildNextSectionTemplate( ScAddr const & tuple, ScAddr const & section) { - nextSectionTemplate.Triple(tuple, ScType::EdgeAccessVarPosPerm >> sections_aliases::SECTION_EDGE, section); + nextSectionTemplate.Triple(tuple, ScType::VarPermPosArc >> sections_aliases::SECTION_EDGE, section); nextSectionTemplate.Triple( tuple, - ScType::EdgeAccessVarPosPerm >> sections_aliases::NEXT_SECTION_ARC, - ScType::NodeVar >> sections_aliases::SECTION_NODE); + ScType::VarPermPosArc >> sections_aliases::NEXT_SECTION_ARC, + ScType::VarNode >> sections_aliases::SECTION_NODE); nextSectionTemplate.Quintuple( sections_aliases::SECTION_EDGE, - ScType::EdgeDCommonVar >> sections_aliases::BASE_SEQUENCE_EDGE, + ScType::VarCommonArc >> sections_aliases::BASE_SEQUENCE_EDGE, sections_aliases::NEXT_SECTION_ARC, - ScType::EdgeAccessVarPosPerm, - scAgentsCommon::CoreKeynodes::nrel_basic_sequence); + ScType::VarPermPosArc, + ScKeynodes::nrel_basic_sequence); } void sections_builder::buildPreviousSectionTemplate( @@ -65,17 +63,17 @@ void sections_builder::buildPreviousSectionTemplate( ScAddr const & tuple, ScAddr const & section) { - previousSectionTemplate.Triple(tuple, ScType::EdgeAccessVarPosPerm >> sections_aliases::SECTION_EDGE, section); + previousSectionTemplate.Triple(tuple, ScType::VarPermPosArc >> sections_aliases::SECTION_EDGE, section); previousSectionTemplate.Triple( tuple, - ScType::EdgeAccessVarPosPerm >> sections_aliases::PREVIOUS_SECTION_ARC, - ScType::NodeVar >> sections_aliases::SECTION_NODE); + ScType::VarPermPosArc >> sections_aliases::PREVIOUS_SECTION_ARC, + ScType::VarNode >> sections_aliases::SECTION_NODE); previousSectionTemplate.Quintuple( sections_aliases::PREVIOUS_SECTION_ARC, - ScType::EdgeDCommonVar >> sections_aliases::BASE_SEQUENCE_EDGE, + ScType::VarCommonArc >> sections_aliases::BASE_SEQUENCE_EDGE, sections_aliases::SECTION_EDGE, - ScType::EdgeAccessVarPosPerm, - scAgentsCommon::CoreKeynodes::nrel_basic_sequence); + ScType::VarPermPosArc, + ScKeynodes::nrel_basic_sequence); } } // namespace sectionsModule diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/generator/sections_generator.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/generator/sections_generator.cpp index d533f4d0..57d6b987 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/generator/sections_generator.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/generator/sections_generator.cpp @@ -19,18 +19,18 @@ ScAddr sections_generator::GenerateSection( ScAddr const & lang, bool isAtomic) { - ScAddr section = context->CreateNode(ScType::NodeConstClass); + ScAddr section = context->GenerateNode(ScType::ConstNodeClass); utils::CommonUtils::setMainIdtf(context, section, sectionName, {lang}); ScTemplate sectionTemplate; - sectionTemplate.Triple(SectionsKeynodes::section, ScType::EdgeAccessVarPosPerm, section); + sectionTemplate.Triple(SectionsKeynodes::section, ScType::VarPermPosArc, section); if (isAtomic) - sectionTemplate.Triple(SectionsKeynodes::atomic_section, ScType::EdgeAccessVarPosPerm, section); + sectionTemplate.Triple(SectionsKeynodes::atomic_section, ScType::VarPermPosArc, section); else - sectionTemplate.Triple(SectionsKeynodes::non_atomic_section, ScType::EdgeAccessVarPosPerm, section); - sectionTemplate.Triple(SectionsKeynodes::not_enough_formed_structure, ScType::EdgeAccessVarPosPerm, section); + sectionTemplate.Triple(SectionsKeynodes::non_atomic_section, ScType::VarPermPosArc, section); + sectionTemplate.Triple(SectionsKeynodes::not_enough_formed_structure, ScType::VarPermPosArc, section); ScTemplateGenResult genResult; - context->HelperGenTemplate(sectionTemplate, genResult); + context->GenerateByTemplate(sectionTemplate, genResult); return section; } diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/keynodes/sections_keynodes.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/keynodes/sections_keynodes.cpp deleted file mode 100644 index 0439953d..00000000 --- a/platform-dependent-components/problem-solver/cxx/sections-module/keynodes/sections_keynodes.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This source file is part of an OSTIS project. For the latest info, see http://ostis.net - * Distributed under the MIT License - * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) - */ - -#include "sections_keynodes.hpp" - -#include "sc-memory/sc_memory.hpp" - -namespace sectionsModule -{ -ScAddr SectionsKeynodes::action_get_decomposition; -ScAddr SectionsKeynodes::action_add_section; -ScAddr SectionsKeynodes::action_remove_section; -ScAddr SectionsKeynodes::nrel_section_decomposition; -ScAddr SectionsKeynodes::nrel_entity_decomposition; -ScAddr SectionsKeynodes::removed_section; -ScAddr SectionsKeynodes::section; -ScAddr SectionsKeynodes::not_enough_formed_structure; -ScAddr SectionsKeynodes::atomic_section; -ScAddr SectionsKeynodes::non_atomic_section; -ScAddr SectionsKeynodes::rrel_last; -} // namespace sectionsModule diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/keynodes/sections_keynodes.hpp b/platform-dependent-components/problem-solver/cxx/sections-module/keynodes/sections_keynodes.hpp index 05034eff..1630bda4 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/keynodes/sections_keynodes.hpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/keynodes/sections_keynodes.hpp @@ -5,52 +5,36 @@ */ #pragma once - -#include "sc-memory/sc_addr.hpp" -#include "sc-memory/sc_object.hpp" - -#include "generated/sections_keynodes.generated.hpp" +#include namespace sectionsModule { -class SectionsKeynodes : public ScObject +class SectionsKeynodes : public ScKeynodes { - SC_CLASS() - SC_GENERATED_BODY() - public: - SC_PROPERTY(Keynode("action_get_decomposition"), ForceCreate) - static ScAddr action_get_decomposition; + static inline ScKeynode const action_get_decomposition{"action_get_decomposition"}; + + static inline ScKeynode const action_add_section{"action_add_section"}; - SC_PROPERTY(Keynode("action_add_section"), ForceCreate) - static ScAddr action_add_section; + static inline ScKeynode const action_remove_section{"action_remove_section"}; - SC_PROPERTY(Keynode("action_remove_section"), ForceCreate) - static ScAddr action_remove_section; + static inline ScKeynode const nrel_section_decomposition{"nrel_section_decomposition"}; - SC_PROPERTY(Keynode("nrel_section_decomposition"), ForceCreate) - static ScAddr nrel_section_decomposition; + static inline ScKeynode const nrel_entity_decomposition{"nrel_entity_decomposition"}; - SC_PROPERTY(Keynode("nrel_entity_decomposition"), ForceCreate) - static ScAddr nrel_entity_decomposition; + static inline ScKeynode const removed_section{"removed_section"}; - SC_PROPERTY(Keynode("removed_section"), ForceCreate) - static ScAddr removed_section; + static inline ScKeynode const section{"section"}; - SC_PROPERTY(Keynode("section"), ForceCreate) - static ScAddr section; + static inline ScKeynode const not_enough_formed_structure{"not_enough_formed_structure"}; - SC_PROPERTY(Keynode("not_enough_formed_structure"), ForceCreate) - static ScAddr not_enough_formed_structure; + static inline ScKeynode const atomic_section{"atomic_section"}; - SC_PROPERTY(Keynode("atomic_section"), ForceCreate) - static ScAddr atomic_section; + static inline ScKeynode const non_atomic_section{"non_atomic_section"}; - SC_PROPERTY(Keynode("non_atomic_section"), ForceCreate) - static ScAddr non_atomic_section; + static inline ScKeynode const rrel_last{"rrel_last"}; - SC_PROPERTY(Keynode("rrel_last"), ForceCreate) - static ScAddr rrel_last; + static inline ScKeynode const nrel_answer{"nrel_answer"}; }; } // namespace sectionsModule diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/subject_domain_module.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/subject_domain_module.cpp index 02fbe889..d83f0163 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/subject_domain_module.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/subject_domain_module.cpp @@ -14,25 +14,7 @@ using namespace sectionsModule; -SC_IMPLEMENT_MODULE(SectionsModule) - -sc_result SectionsModule::InitializeImpl() -{ - if (!sectionsModule::SectionsKeynodes::InitGlobal()) - return SC_RESULT_ERROR; - - SC_AGENT_REGISTER(GetDecompositionAgent) - SC_AGENT_REGISTER(AddSectionAgent) - SC_AGENT_REGISTER(RemoveSectionAgent) - - return SC_RESULT_OK; -} - -sc_result SectionsModule::ShutdownImpl() -{ - SC_AGENT_UNREGISTER(GetDecompositionAgent) - SC_AGENT_UNREGISTER(AddSectionAgent) - SC_AGENT_UNREGISTER(RemoveSectionAgent) - - return SC_RESULT_OK; -} +SC_MODULE_REGISTER(SectionsModule) + ->Agent() + ->Agent() + ->Agent(); diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/subject_domain_module.hpp b/platform-dependent-components/problem-solver/cxx/sections-module/subject_domain_module.hpp index fd7111e9..3bd51e4a 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/subject_domain_module.hpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/subject_domain_module.hpp @@ -8,14 +8,6 @@ #include "sc-memory/sc_module.hpp" -#include "generated/subject_domain_module.generated.hpp" - class SectionsModule : public ScModule { - SC_CLASS(LoadOrder(100)) - SC_GENERATED_BODY() - - virtual sc_result InitializeImpl() override; - - virtual sc_result ShutdownImpl() override; }; diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_add_section.scs b/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_add_section.scs index f38a6976..4a6269ad 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_add_section.scs +++ b/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_add_section.scs @@ -1,22 +1,22 @@ -test_action_node <- question; action_add_section; +test_action_node <- action; action_add_section; -> rrel_1: [new section]; -> rrel_2: knowledge_base_IMS; -> rrel_3: lang_en;; -test_action_node2 <- question; action_add_section; +test_action_node2 <- action; action_add_section; -> rrel_1: [new section]; -> rrel_2: section_project_IMS_history_and_development_programme; -> rrel_3: lang_en;; -test_action_node3 <- question; action_add_section; +test_action_node3 <- action; action_add_section; -> rrel_2: section_project_IMS_history_and_development_programme; -> rrel_3: lang_en;; -test_action_node4 <- question; action_add_section; +test_action_node4 <- action; action_add_section; -> rrel_1: [new section]; -> rrel_2: section_project_IMS_history_and_development_programme;; -test_action_node5 <- question; action_add_section; +test_action_node5 <- action; action_add_section; -> rrel_1: [new section]; -> rrel_3: lang_en;; diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_remove_section.scs b/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_remove_section.scs index 7aa09fef..6ee8b0bb 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_remove_section.scs +++ b/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_remove_section.scs @@ -1,15 +1,15 @@ -test_action_node <- question; action_remove_section; +test_action_node <- action; action_remove_section; -> rrel_1: section_OSTIS_technology; -> rrel_2: knowledge_base_IMS;; -test_action_node2 <- question; action_remove_section; +test_action_node2 <- action; action_remove_section; -> rrel_1: doc_IMS; -> rrel_2: section_project_OSTIS_perspectives_current_state_history_of_evolution_and_use;; -test_action_node3 <- question; action_remove_section; +test_action_node3 <- action; action_remove_section; -> rrel_2: section_inner_project_IMS_history_and_development_programme;; -test_action_node4 <- question; action_remove_section; +test_action_node4 <- action; action_remove_section; -> rrel_1: section_inner_project_IMS_history_and_development_programme;; diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_successful_decomposition.scs b/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_successful_decomposition.scs index ce6b6d8c..0344e8a3 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_successful_decomposition.scs +++ b/platform-dependent-components/problem-solver/cxx/sections-module/test/testStructures/test_successful_decomposition.scs @@ -1,12 +1,12 @@ nrel_section_base_order <- sc_node_norole_relation;; -test_action_node <- question; action_get_decomposition; +test_action_node <- action; action_get_decomposition; -> rrel_1: root_section; -> rrel_3: lang_ru; -> rrel_4: nrel_entity_decomposition;; -test_action_node2 <- question; action_get_decomposition; +test_action_node2 <- action; action_get_decomposition; -> rrel_1: root_section; -> rrel_2: [2]; -> rrel_3: lang_ru; diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/test/tests.cmake b/platform-dependent-components/problem-solver/cxx/sections-module/test/tests.cmake index c0a444b5..d2c7e6c2 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/test/tests.cmake +++ b/platform-dependent-components/problem-solver/cxx/sections-module/test/tests.cmake @@ -1,7 +1,7 @@ make_tests_from_folder(${CMAKE_CURRENT_LIST_DIR}/units NAME sections-module-test-starter DEPENDS sc-memory sc-core sc-builder-lib sections-module - INCLUDES ${SC_MEMORY_SRC}/tests/sc-memory/_test ${SC_TOOLS_SRC} + INCLUDES ${SC_MEMORY_SRC} ${SC_TOOLS_SRC} ${SC_BUILDER_PATH} ) add_definitions(-DSUBJECT_DOMAIN_MODULE_TEST_SRC_PATH="${CMAKE_CURRENT_LIST_DIR}") diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/test/units/add_section_agent_test.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/test/units/add_section_agent_test.cpp index e684ab98..1a8e5ed1 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/test/units/add_section_agent_test.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/test/units/add_section_agent_test.cpp @@ -8,16 +8,14 @@ #include "keynodes/sections_keynodes.hpp" #include "utils/sections_utils.hpp" -#include "sc-builder/src/scs_loader.hpp" +#include +#include +#include -#include "sc_test.hpp" - -#include "sc-agents-common/keynodes/coreKeynodes.hpp" #include "sc-agents-common/utils/CommonUtils.hpp" -#include "sc-agents-common/utils/AgentUtils.hpp" #include "sc-agents-common/utils/IteratorUtils.hpp" -#include "sc-memory/kpm/sc_agent.hpp" +#include #include "sc-memory/utils/sc_base64.hpp" #include @@ -34,127 +32,110 @@ using AddSectionTest = ScMemoryTest; TEST_F(AddSectionTest, successful_add_section_to_decomposition) { - ScMemoryContext & context = *m_ctx; - scAgentsCommon::CoreKeynodes::InitGlobal(); - SectionsKeynodes::InitGlobal(); - SC_AGENT_REGISTER(AddSectionAgent) + ScAgentContext & context = *m_ctx; + ScsLoader loader; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_add_section.scs"); - ScAddr testActionNode = context.HelperFindBySystemIdtf("test_action_node"); - ScAddr parentSectionAddr = - utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, scAgentsCommon::CoreKeynodes::rrel_2); + + ScAddr testActionNode = context.SearchElementBySystemIdentifier("test_action_node"); + ScAction testAction = context.ConvertToAction(testActionNode); + + ScAddr parentSectionAddr = utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, ScKeynodes::rrel_2); ScAddr decompositionTupleAddr = sections_utils::GetSectionDecompositionTuple(&context, parentSectionAddr); size_t decompositionSize = utils::CommonUtils::getSetPower(&context, decompositionTupleAddr); - utils::AgentUtils::applyAction(&context, testActionNode, 1000); - ScIterator5Ptr it5 = context.Iterator5( - testActionNode, - ScType::EdgeDCommon, - ScType::Unknown, - ScType::EdgeAccessConstPosPerm, - scAgentsCommon::CoreKeynodes::nrel_answer); - EXPECT_TRUE(it5->Next()); + context.SubscribeAgent(); - ScIterator3Ptr it3 = context.Iterator3(it5->Get(2), ScType::EdgeAccessConstPosPerm, ScType::Unknown); + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + ScStructure result = testAction.GetResult(); + + ScIterator3Ptr it3 = context.CreateIterator3(result, ScType::ConstPermPosArc, ScType::Unknown); EXPECT_TRUE(it3->Next()); EXPECT_TRUE(context.IsElement(it3->Get(2))); EXPECT_EQ(utils::CommonUtils::getSetPower(&context, decompositionTupleAddr) - decompositionSize, 1u); - SC_AGENT_UNREGISTER(AddSectionAgent) + context.UnsubscribeAgent(); } TEST_F(AddSectionTest, successful_add_section_empty_decomposition) { - ScMemoryContext & context = *m_ctx; - scAgentsCommon::CoreKeynodes::InitGlobal(); - SectionsKeynodes::InitGlobal(); + ScAgentContext & context = *m_ctx; - SC_AGENT_REGISTER(AddSectionAgent) ScsLoader loader; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_add_section.scs"); - ScAddr testActionNode = context.HelperFindBySystemIdtf("test_action_node2"); - ScAddr parentSectionAddr = - utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, scAgentsCommon::CoreKeynodes::rrel_2); - - utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME); - ScIterator5Ptr it5 = context.Iterator5( - testActionNode, - ScType::EdgeDCommon, - ScType::Unknown, - ScType::EdgeAccessConstPosPerm, - scAgentsCommon::CoreKeynodes::nrel_answer); - EXPECT_TRUE(it5->Next()); - - ScIterator3Ptr it3 = context.Iterator3(it5->Get(2), ScType::EdgeAccessConstPosPerm, ScType::NodeConst); + + ScAddr testActionNode = context.SearchElementBySystemIdentifier("test_action_node2"); + ScAddr parentSectionAddr = utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, ScKeynodes::rrel_2); + + ScAction testAction = context.ConvertToAction(testActionNode); + + context.SubscribeAgent(); + + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + + ScStructure result = testAction.GetResult(); + + ScIterator3Ptr it3 = context.CreateIterator3(result, ScType::ConstPermPosArc, ScType::ConstNode); EXPECT_TRUE(it3->Next()); EXPECT_TRUE(context.IsElement(it3->Get(2))); ScAddr decompositionTupleAddr = sections_utils::GetSectionDecompositionTuple(&context, parentSectionAddr); EXPECT_EQ(utils::CommonUtils::getSetPower(&context, decompositionTupleAddr), 1u); - SC_AGENT_UNREGISTER(AddSectionAgent) + context.UnsubscribeAgent(); } TEST_F(AddSectionTest, add_section_invalid_parameters_1) { - ScMemoryContext & context = *m_ctx; - scAgentsCommon::CoreKeynodes::InitGlobal(); - SectionsKeynodes::InitGlobal(); + ScAgentContext & context = *m_ctx; - SC_AGENT_REGISTER(AddSectionAgent) ScsLoader loader; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_add_section.scs"); - ScAddr testActionNode = context.HelperFindBySystemIdtf("test_action_node3"); + ScAddr testActionNode = context.SearchElementBySystemIdentifier("test_action_node3"); + + ScAction testAction = context.ConvertToAction(testActionNode); - EXPECT_TRUE(utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME)); - EXPECT_TRUE(context.HelperCheckEdge( - scAgentsCommon::CoreKeynodes::question_finished_unsuccessfully, testActionNode, ScType::EdgeAccessConstPosPerm)); + context.SubscribeAgent(); - SC_AGENT_UNREGISTER(AddSectionAgent) + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + EXPECT_TRUE(testAction.IsFinishedUnsuccessfully()); + context.UnsubscribeAgent(); } TEST_F(AddSectionTest, add_section_invalid_parameters_3) { - ScMemoryContext & context = *m_ctx; - scAgentsCommon::CoreKeynodes::InitGlobal(); - SectionsKeynodes::InitGlobal(); + ScAgentContext & context = *m_ctx; - SC_AGENT_REGISTER(AddSectionAgent) ScsLoader loader; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_add_section.scs"); - ScAddr testActionNode = context.HelperFindBySystemIdtf("test_action_node4"); + ScAddr testActionNode = context.SearchElementBySystemIdentifier("test_action_node4"); - EXPECT_TRUE(utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME)); - EXPECT_TRUE(context.HelperCheckEdge( - scAgentsCommon::CoreKeynodes::question_finished_unsuccessfully, testActionNode, ScType::EdgeAccessConstPosPerm)); + ScAction testAction = context.ConvertToAction(testActionNode); - SC_AGENT_UNREGISTER(AddSectionAgent) + context.SubscribeAgent(); + + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + EXPECT_TRUE(testAction.IsFinishedUnsuccessfully()); + context.UnsubscribeAgent(); } TEST_F(AddSectionTest, add_section_without_parent) { - ScMemoryContext & context = *m_ctx; - scAgentsCommon::CoreKeynodes::InitGlobal(); - SectionsKeynodes::InitGlobal(); + ScAgentContext & context = *m_ctx; - SC_AGENT_REGISTER(AddSectionAgent) ScsLoader loader; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_add_section.scs"); - ScAddr testActionNode = context.HelperFindBySystemIdtf("test_action_node5"); - ScAddr sectionNameAddr = - utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, scAgentsCommon::CoreKeynodes::rrel_1); - - EXPECT_TRUE(utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME)); - ScIterator5Ptr it5 = context.Iterator5( - testActionNode, - ScType::EdgeDCommon, - ScType::Unknown, - ScType::EdgeAccessConstPosPerm, - scAgentsCommon::CoreKeynodes::nrel_answer); - EXPECT_TRUE(it5->Next()); - - ScIterator3Ptr it3 = context.Iterator3(it5->Get(2), ScType::EdgeAccessConstPosPerm, ScType::NodeConst); + ScAddr testActionNode = context.SearchElementBySystemIdentifier("test_action_node5"); + ScAddr sectionNameAddr = utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, ScKeynodes::rrel_1); + ScAction testAction = context.ConvertToAction(testActionNode); + + context.SubscribeAgent(); + + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + ScStructure result = testAction.GetResult(); + + ScIterator3Ptr it3 = context.CreateIterator3(result, ScType::ConstPermPosArc, ScType::ConstNode); EXPECT_TRUE(it3->Next()); EXPECT_TRUE(context.IsElement(it3->Get(2))); @@ -164,6 +145,6 @@ TEST_F(AddSectionTest, add_section_without_parent) EXPECT_TRUE(context.IsElement(sectionAddr)); EXPECT_EQ(it3->Get(2), sectionAddr); - SC_AGENT_UNREGISTER(AddSectionAgent) + context.UnsubscribeAgent(); } } // namespace subjDomainTest diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/test/units/get_decomposition_agent_test.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/test/units/get_decomposition_agent_test.cpp index 1f74940c..91aaad79 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/test/units/get_decomposition_agent_test.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/test/units/get_decomposition_agent_test.cpp @@ -7,15 +7,12 @@ #include "agent/get_decomposition_agent.hpp" #include "keynodes/sections_keynodes.hpp" -#include "sc-builder/src/scs_loader.hpp" +#include +#include +#include -#include "sc_test.hpp" - -#include "sc-agents-common/keynodes/coreKeynodes.hpp" #include "sc-agents-common/utils/CommonUtils.hpp" -#include "sc-agents-common/utils/AgentUtils.hpp" - -#include "sc-memory/kpm/sc_agent.hpp" +#include #include "sc-memory/utils/sc_base64.hpp" #include @@ -39,33 +36,20 @@ int const WAIT_TIME = 1000; using GetSectionDecompositionTest = ScMemoryTest; -void initialize() +TEST_F(GetSectionDecompositionTest, successful_decomposition) { - scAgentsCommon::CoreKeynodes::InitGlobal(); - SectionsKeynodes::InitGlobal(); + ScAgentContext & context = *m_ctx; + loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_successful_decomposition.scs"); + ScAddr const testActionNode = context.SearchElementBySystemIdentifier("test_action_node"); - SC_AGENT_REGISTER(GetDecompositionAgent) -} + ScAction testAction = context.ConvertToAction(testActionNode); -void shutdown(){SC_AGENT_UNREGISTER(GetDecompositionAgent)} + context.SubscribeAgent(); -TEST_F(GetSectionDecompositionTest, successful_decomposition) -{ - ScMemoryContext & context = *m_ctx; - initialize(); - loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_successful_decomposition.scs"); - ScAddr const testActionNode = context.HelperFindBySystemIdtf("test_action_node"); - - utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME); - ScIterator5Ptr it5 = context.Iterator5( - testActionNode, - ScType::EdgeDCommon, - ScType::Unknown, - ScType::EdgeAccessConstPosPerm, - scAgentsCommon::CoreKeynodes::nrel_answer); - EXPECT_TRUE(it5->Next()); - - ScIterator3Ptr const it3 = context.Iterator3(it5->Get(2), ScType::EdgeAccessConstPosPerm, ScType::Link); + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + ScStructure result = testAction.GetResult(); + + ScIterator3Ptr const it3 = context.CreateIterator3(result, ScType::ConstPermPosArc, ScType::NodeLink); EXPECT_TRUE(it3->Next()); std::string decompositionContent; context.GetLinkContent(it3->Get(2), decompositionContent); @@ -76,26 +60,23 @@ TEST_F(GetSectionDecompositionTest, successful_decomposition) json testJson = GetTestJSON(); EXPECT_EQ(temp, GetTestJSON()); - shutdown(); + context.UnsubscribeAgent(); } TEST_F(GetSectionDecompositionTest, successful_decomposition_with_level) { - ScMemoryContext & context = *m_ctx; - initialize(); + ScAgentContext & context = *m_ctx; + loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_successful_decomposition.scs"); - ScAddr const testActionNode = context.HelperFindBySystemIdtf("test_action_node2"); - - context.CreateEdge(ScType::EdgeAccessConstPosPerm, scAgentsCommon::CoreKeynodes::question_initiated, testActionNode); - EXPECT_TRUE(utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME)); - ScIterator5Ptr const it5 = context.Iterator5( - testActionNode, - ScType::EdgeDCommon, - ScType::Unknown, - ScType::EdgeAccessConstPosPerm, - scAgentsCommon::CoreKeynodes::nrel_answer); - EXPECT_TRUE(it5->Next()); - ScIterator3Ptr it3 = context.Iterator3(it5->Get(2), ScType::EdgeAccessConstPosPerm, ScType::Link); + ScAddr const testActionNode = context.SearchElementBySystemIdentifier("test_action_node2"); + ScAction testAction = context.ConvertToAction(testActionNode); + + context.SubscribeAgent(); + + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + ScStructure result = testAction.GetResult(); + + ScIterator3Ptr it3 = context.CreateIterator3(result, ScType::ConstPermPosArc, ScType::NodeLink); EXPECT_TRUE(it3->Next()); std::string decompositionText; @@ -107,7 +88,7 @@ TEST_F(GetSectionDecompositionTest, successful_decomposition_with_level) json testJson = GetTestJSON(2); EXPECT_EQ(temp, GetTestJSON(2)); - shutdown(); + context.UnsubscribeAgent(); } json GetDecompositionIdList(json const & answerDecomposition, int level) diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/test/units/remove_section_agent_test.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/test/units/remove_section_agent_test.cpp index 599ed59a..7b721c12 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/test/units/remove_section_agent_test.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/test/units/remove_section_agent_test.cpp @@ -8,16 +8,14 @@ #include "constants/sections_aliases.hpp" #include "utils/sections_utils.hpp" -#include "sc-builder/src/scs_loader.hpp" - -#include "sc_test.hpp" +#include +#include +#include #include "sc-agents-common/utils/CommonUtils.hpp" -#include "sc-agents-common/utils/AgentUtils.hpp" #include "sc-agents-common/utils/IteratorUtils.hpp" -#include "sc-memory/kpm/sc_agent.hpp" - +#include #include using namespace sectionsModule; @@ -33,123 +31,116 @@ using RemoveSectionTest = ScMemoryTest; TEST_F(RemoveSectionTest, successful_remove_section_from_decomposition) { - ScMemoryContext & context = *m_ctx; - scAgentsCommon::CoreKeynodes::InitGlobal(); - SectionsKeynodes::InitGlobal(); - SC_AGENT_REGISTER(RemoveSectionAgent) + ScAgentContext & context = *m_ctx; + ScsLoader loader; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_remove_section.scs"); - ScAddr testActionNode = context.HelperFindBySystemIdtf("test_action_node"); - ScAddr sectionAddr = - utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, scAgentsCommon::CoreKeynodes::rrel_1); - ScAddr parentSectionAddr = - utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, scAgentsCommon::CoreKeynodes::rrel_2); + + ScAddr testActionNode = context.SearchElementBySystemIdentifier("test_action_node"); + ScAction testAction = context.ConvertToAction(testActionNode); + + ScAddr sectionAddr = utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, ScKeynodes::rrel_1); + ScAddr parentSectionAddr = utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, ScKeynodes::rrel_2); ScAddr decompositionTupleAddr = sections_utils::GetSectionDecompositionTuple(&context, parentSectionAddr); size_t decompositionSize = utils::CommonUtils::getSetPower(&context, decompositionTupleAddr); - context.CreateEdge(ScType::EdgeAccessConstPosPerm, scAgentsCommon::CoreKeynodes::question_initiated, testActionNode); - utils::AgentUtils::applyAction(&context, testActionNode, 1000); - ScIterator5Ptr it5 = context.Iterator5( - testActionNode, - ScType::EdgeDCommon, - ScType::Unknown, - ScType::EdgeAccessConstPosPerm, - scAgentsCommon::CoreKeynodes::nrel_answer); - EXPECT_TRUE(it5->Next()); - ScIterator3Ptr it3 = context.Iterator3(it5->Get(2), ScType::EdgeAccessConstPosPerm, ScType::Unknown); + context.SubscribeAgent(); + + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + ScStructure result = testAction.GetResult(); + + ScIterator3Ptr it3 = context.CreateIterator3(result, ScType::ConstPermPosArc, ScType::Unknown); EXPECT_TRUE(it3->Next()); - EXPECT_TRUE(context.HelperCheckEdge(SectionsKeynodes::removed_section, sectionAddr, ScType::EdgeAccessConstPosPerm)); + EXPECT_TRUE(context.CheckConnector(SectionsKeynodes::removed_section, sectionAddr, ScType::ConstPermPosArc)); EXPECT_EQ(decompositionSize - utils::CommonUtils::getSetPower(&context, decompositionTupleAddr), 1u); - SC_AGENT_UNREGISTER(RemoveSectionAgent) + context.UnsubscribeAgent(); } TEST_F(RemoveSectionTest, successful_remove_section_from_decomposition_2) { - ScMemoryContext & context = *m_ctx; - scAgentsCommon::CoreKeynodes::InitGlobal(); - SectionsKeynodes::InitGlobal(); + ScAgentContext & context = *m_ctx; - SC_AGENT_REGISTER(RemoveSectionAgent) ScsLoader loader; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_remove_section.scs"); - ScAddr testActionNode = context.HelperFindBySystemIdtf("test_action_node2"); - ScAddr sectionAddr = - utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, scAgentsCommon::CoreKeynodes::rrel_1); - ScAddr parentSectionAddr = - utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, scAgentsCommon::CoreKeynodes::rrel_2); - - context.CreateEdge(ScType::EdgeAccessConstPosPerm, scAgentsCommon::CoreKeynodes::question_initiated, testActionNode); - utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME); - ScIterator5Ptr it5 = context.Iterator5( - testActionNode, - ScType::EdgeDCommon, - ScType::Unknown, - ScType::EdgeAccessConstPosPerm, - scAgentsCommon::CoreKeynodes::nrel_answer); - EXPECT_TRUE(it5->Next()); - ScIterator3Ptr it3 = context.Iterator3(it5->Get(2), ScType::EdgeAccessConstPosPerm, ScType::NodeConst); + + ScAddr testActionNode = context.SearchElementBySystemIdentifier("test_action_node2"); + ScAction testAction = context.ConvertToAction(testActionNode); + + context.SubscribeAgent(); + + ScAddr sectionAddr = utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, ScKeynodes::rrel_1); + ScAddr parentSectionAddr = utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, ScKeynodes::rrel_2); + + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + + ScStructure result = testAction.GetResult(); + + ScIterator3Ptr it3 = context.CreateIterator3(result, ScType::ConstPermPosArc, ScType::ConstNode); EXPECT_TRUE(it3->Next()); ScTemplate scTemplate; scTemplate.Quintuple( - ScType::NodeVarTuple >> sections_aliases::DECOMPOSITION_TUPLE, - ScType::EdgeDCommonVar, + ScType::VarNodeTuple >> sections_aliases::DECOMPOSITION_TUPLE, + ScType::VarCommonArc, parentSectionAddr, - ScType::EdgeAccessVarPosPerm, + ScType::VarPermPosArc, SectionsKeynodes::nrel_entity_decomposition); ScTemplateSearchResult searchResult; - context.HelperSearchTemplate(scTemplate, searchResult); + context.SearchByTemplate(scTemplate, searchResult); EXPECT_TRUE(searchResult.IsEmpty()); - EXPECT_TRUE(context.HelperCheckEdge(SectionsKeynodes::removed_section, sectionAddr, ScType::EdgeAccessConstPosPerm)); - SC_AGENT_UNREGISTER(RemoveSectionAgent) + EXPECT_TRUE(context.CheckConnector(SectionsKeynodes::removed_section, sectionAddr, ScType::ConstPermPosArc)); + + context.UnsubscribeAgent(); } TEST_F(RemoveSectionTest, remove_section_invalid_parameters_1) { - ScMemoryContext & context = *m_ctx; - scAgentsCommon::CoreKeynodes::InitGlobal(); - SectionsKeynodes::InitGlobal(); + ScAgentContext & context = *m_ctx; - SC_AGENT_REGISTER(RemoveSectionAgent) ScsLoader loader; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_remove_section.scs"); - ScAddr testActionNode = context.HelperFindBySystemIdtf("test_action_node3"); - EXPECT_TRUE(utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME)); - EXPECT_TRUE(context.HelperCheckEdge( - scAgentsCommon::CoreKeynodes::question_finished_unsuccessfully, testActionNode, ScType::EdgeAccessConstPosPerm)); + ScAddr testActionNode = context.SearchElementBySystemIdentifier("test_action_node3"); + ScAction testAction = context.ConvertToAction(testActionNode); + + context.SubscribeAgent(); - SC_AGENT_UNREGISTER(RemoveSectionAgent) + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + EXPECT_TRUE(testAction.IsFinishedUnsuccessfully()); + + context.UnsubscribeAgent(); } TEST_F(RemoveSectionTest, remove_section_without_parent) { - ScMemoryContext & context = *m_ctx; - scAgentsCommon::CoreKeynodes::InitGlobal(); - SectionsKeynodes::InitGlobal(); + ScAgentContext & context = *m_ctx; - SC_AGENT_REGISTER(RemoveSectionAgent) ScsLoader loader; loader.loadScsFile(context, TEST_FILES_DIR_PATH + "test_remove_section.scs"); - ScAddr testActionNode = context.HelperFindBySystemIdtf("test_action_node4"); - ScAddr sectionAddr = - utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, scAgentsCommon::CoreKeynodes::rrel_1); - EXPECT_TRUE(utils::AgentUtils::applyAction(&context, testActionNode, WAIT_TIME)); - EXPECT_TRUE(context.HelperCheckEdge(SectionsKeynodes::removed_section, sectionAddr, ScType::EdgeAccessConstPosPerm)); + ScAddr testActionNode = context.SearchElementBySystemIdentifier("test_action_node4"); + ScAction testAction = context.ConvertToAction(testActionNode); + + context.SubscribeAgent(); + + ScAddr sectionAddr = utils::IteratorUtils::getAnyByOutRelation(&context, testActionNode, ScKeynodes::rrel_1); + + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + + EXPECT_TRUE(context.CheckConnector(SectionsKeynodes::removed_section, sectionAddr, ScType::ConstPermPosArc)); ScTemplate scTemplate; scTemplate.Quintuple( - ScType::NodeVarTuple >> sections_aliases::DECOMPOSITION_TUPLE, - ScType::EdgeDCommonVar, - ScType::NodeVar, - ScType::EdgeAccessVarPosPerm, + ScType::VarNodeTuple >> sections_aliases::DECOMPOSITION_TUPLE, + ScType::VarCommonArc, + ScType::VarNode, + ScType::VarPermPosArc, SectionsKeynodes::nrel_entity_decomposition); - scTemplate.Triple(sections_aliases::DECOMPOSITION_TUPLE, ScType::EdgeAccessVarPosPerm, sectionAddr); + scTemplate.Triple(sections_aliases::DECOMPOSITION_TUPLE, ScType::VarPermPosArc, sectionAddr); ScTemplateSearchResult searchResult; - context.HelperSearchTemplate(scTemplate, searchResult); + context.SearchByTemplate(scTemplate, searchResult); EXPECT_TRUE(searchResult.IsEmpty()); - SC_AGENT_UNREGISTER(RemoveSectionAgent) + context.UnsubscribeAgent(); } } // namespace subjDomainTest diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/utils/sections_utils.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/utils/sections_utils.cpp index c46fa0d5..389e94c8 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/utils/sections_utils.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/utils/sections_utils.cpp @@ -22,31 +22,29 @@ ScAddr sections_utils::GetSectionDecompositionTuple(ScMemoryContext * context, S ScTemplate scTemplate; scTemplate.Quintuple( sectionAddr, - ScType::EdgeDCommonVar, - ScType::NodeVar >> sections_aliases::DECOMPOSITION_TUPLE, - ScType::EdgeAccessVarPosPerm, + ScType::VarCommonArc, + ScType::VarNode >> sections_aliases::DECOMPOSITION_TUPLE, + ScType::VarPermPosArc, SectionsKeynodes::nrel_entity_decomposition); ScTemplateSearchResult searchResult; - context->HelperSearchTemplate(scTemplate, searchResult); + context->SearchByTemplate(scTemplate, searchResult); if (!searchResult.IsEmpty()) return searchResult[0][sections_aliases::DECOMPOSITION_TUPLE]; - ScTemplateGenResult genResult; - ScTemplate::Result result = context->HelperGenTemplate(scTemplate, genResult); - if (result) - return genResult[sections_aliases::DECOMPOSITION_TUPLE]; - return {}; + ScTemplateResultItem genResult; + context->GenerateByTemplate(scTemplate, genResult); + + return genResult[sections_aliases::DECOMPOSITION_TUPLE]; } ScAddr sections_utils::FindSectionByName(ScMemoryContext * context, std::string const & sectionName) { ScAddr sectionAddr; - ScAddrVector links = context->FindLinksByContent(sectionName); + ScAddrSet links = context->SearchLinksByContentSubstring(sectionName); if (!links.empty()) { for (ScAddr const & link : links) { - ScAddr section = - utils::IteratorUtils::getAnyByInRelation(context, link, scAgentsCommon::CoreKeynodes::nrel_main_idtf); + ScAddr section = utils::IteratorUtils::getAnyByInRelation(context, link, ScKeynodes::nrel_main_idtf); if (context->IsElement(section)) { sectionAddr = section; diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/utils/sections_utils.hpp b/platform-dependent-components/problem-solver/cxx/sections-module/utils/sections_utils.hpp index 39a516f5..8592cc08 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/utils/sections_utils.hpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/utils/sections_utils.hpp @@ -9,8 +9,6 @@ #include "sc-memory/sc_memory.hpp" #include "sc-agents-common/utils/IteratorUtils.hpp" -#include "sc-agents-common/keynodes/coreKeynodes.hpp" - #include "keynodes/sections_keynodes.hpp" #include diff --git a/platform-dependent-components/problem-solver/cxx/sections-module/utils/set_utils.cpp b/platform-dependent-components/problem-solver/cxx/sections-module/utils/set_utils.cpp index ad07b698..a0b0eb74 100644 --- a/platform-dependent-components/problem-solver/cxx/sections-module/utils/set_utils.cpp +++ b/platform-dependent-components/problem-solver/cxx/sections-module/utils/set_utils.cpp @@ -17,9 +17,9 @@ ScAddrVector SetUtils::GetAllElementsByEdgeType(ScMemoryContext * context, ScAdd return {}; ScAddrVector elements; ScTemplate rightsTemplate; - rightsTemplate.Triple(set, edgeType, ScType::NodeVar >> "_node"); + rightsTemplate.Triple(set, edgeType, ScType::VarNode >> "_node"); ScTemplateSearchResult result; - context->HelperSearchTemplate(rightsTemplate, result); + context->SearchByTemplate(rightsTemplate, result); if (!result.IsEmpty()) { for (int i = 0; i < result.Size(); i++) @@ -31,9 +31,9 @@ ScAddrVector SetUtils::GetAllElementsByEdgeType(ScMemoryContext * context, ScAdd ScAddr SetUtils::GetEdge(ScMemoryContext * context, ScAddr const & source, ScAddr const & target) { ScTemplate scTemplate; - scTemplate.Triple(source, ScType::EdgeAccessVarPosPerm >> "_edge", target); + scTemplate.Triple(source, ScType::VarPermPosArc >> "_edge", target); ScTemplateSearchResult result; - context->HelperSearchTemplate(scTemplate, result); + context->SearchByTemplate(scTemplate, result); if (!result.IsEmpty()) return result[0]["_edge"]; else @@ -58,7 +58,7 @@ void SetUtils::RemoveFromSets(ScMemoryContext * context, ScAddr const & element, void SetUtils::RemoveBaseEdgesFromSet(ScMemoryContext * context, ScAddr const & set) { - ScIterator3Ptr setElementsIterator = context->Iterator3(set, ScType::EdgeAccessConstPosPerm, ScType::Unknown); + ScIterator3Ptr setElementsIterator = context->CreateIterator3(set, ScType::ConstPermPosArc, ScType::Unknown); while (setElementsIterator->Next()) { diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/CMakeLists.txt b/platform-dependent-components/problem-solver/cxx/verification-module/CMakeLists.txt new file mode 100644 index 00000000..7b941db4 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/CMakeLists.txt @@ -0,0 +1,42 @@ +set(VERIFICATION_MODULE_SRC "${CMAKE_CURRENT_LIST_DIR}") + +set(HEADERS + "agent/check-duplicate-constructions-agent.hpp" + "agent/not-enough-specified-objects-search-agent.hpp" + "constants/verification_constants.hpp" + "keynodes/verification_keynodes.hpp" + "searcher/check_duplicate_constructions_searcher.hpp" + "generator/verification_generator.hpp" + "verification_module.hpp" +) + +set(SOURCES + "agent/check-duplicate-constructions-agent.cpp" + "agent/not-enough-specified-objects-search-agent.cpp" + "constants/verification_constants.cpp" + "searcher/check_duplicate_constructions_searcher.cpp" + "generator/verification_generator.cpp" + "verification_module.cpp" +) + +add_library(verification-module SHARED ${HEADERS} ${SOURCES}) +target_link_libraries(verification-module + LINK_PUBLIC sc-memory + LINK_PUBLIC sc-agents-common + LINK_PUBLIC nlohmann_json::nlohmann_json) +target_include_directories(verification-module + PUBLIC ${VERIFICATION_MODULE_SRC} + PUBLIC ${SC_MEMORY_SRC} + PUBLIC ${SC_CORE_PATH} + PUBLIC ${SC_AGENTS_COMMON_PATH} + PUBLIC ${SC_KPM_SRC} + PUBLIC ${SC_BUILDER_PATH} +) + +if(${SC_CLANG_FORMAT_CODE}) + target_clangformat_setup(verification-module) +endif() + +if(${SC_BUILD_TESTS}) + include(${VERIFICATION_MODULE_SRC}/test/tests.cmake) +endif() diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/agent/check-duplicate-constructions-agent.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/agent/check-duplicate-constructions-agent.cpp new file mode 100644 index 00000000..664671f0 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/agent/check-duplicate-constructions-agent.cpp @@ -0,0 +1,423 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ +#include +#include "tuple" +#include "filesystem" +#include "sc-agents-common/utils/CommonUtils.hpp" +#include "sc-memory/sc_keynodes.hpp" + +#include "constants/verification_constants.hpp" +#include "keynodes/verification_keynodes.hpp" +#include "searcher/check_duplicate_constructions_searcher.hpp" + +#include "check-duplicate-constructions-agent.hpp" + +using namespace utils; + +namespace verificationModule +{ + +ScResult CheckDuplicateConstructionsAgent::DoProgram(ScActionInitiatedEvent const & event, ScAction & action) +{ + auto [classAddr] = action.GetArguments<1>(); + if (!m_context.IsElement(classAddr)) + { + SC_AGENT_LOG_ERROR("CheckDuplicateConstructionsAgent: class not found."); + return action.FinishUnsuccessfully(); + } + + SC_LOG_DEBUG("CheckDuplicateConstructionsAgent started"); + + try + { + std::string stringMainIdtf = m_context.GetElementSystemIdentifier(classAddr); + std::string stringDomainSection; + // находим идентификатор класса + stringDomainSection = findDomainSectionIdtf(classAddr, stringDomainSection); + + std::ofstream outputFile = createOutputFile(stringMainIdtf, classAddr); + + std::time_t now = std::time(nullptr); + std::tm* localTime = std::localtime(&now); + + // Форматируем дату и время + char buffer[100]; + std::strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", localTime); + + outputFile << "Current date and time: " << buffer << std::endl; + + std::vector classObjects = createClassObjectsVector(classAddr); + + checkDuplicateTriplets(classObjects, outputFile, stringDomainSection); + + checkDuplicateFives(classObjects, outputFile, stringDomainSection); + + checkDuplicateQuasyRelations(classObjects, outputFile); + + outputFile.close(); + + return action.FinishSuccessfully(); + } + catch (utils::ScException const & exception) + { + return action.FinishUnsuccessfully(); + } +} + +std::string CheckDuplicateConstructionsAgent::findDomainSectionIdtf(ScAddr & classAddr, std::string & stringDomainSection) +{ + std::string stringMainIdtf = m_context.GetElementSystemIdentifier(classAddr); + + ScIterator5Ptr const & subjectDomainClassIterator = m_context.CreateIterator5( + ScType::Node, + ScType::ConstPermPosArc, + classAddr, + ScType::ConstPermPosArc, + VerificationKeynodes::rrel_maximum_studied_object_class); + if (subjectDomainClassIterator->Next()) + { + ScAddr domainSection = subjectDomainClassIterator->Get(0); + stringDomainSection = + m_context.GetElementSystemIdentifier(domainSection); // нашли идентификатор предметной области объекта класса + } + + if (stringDomainSection == "") + { + ScIterator5Ptr const & subjectDomainClassIterator = m_context.CreateIterator5( + ScType::Node, + ScType::ConstPermPosArc, + classAddr, + ScType::ConstPermPosArc, + VerificationKeynodes::rrel_not_maximum_studied_object_class); + + if (subjectDomainClassIterator->Next()) + { + ScAddr domainSection = subjectDomainClassIterator->Get(0); + stringDomainSection = m_context.GetElementSystemIdentifier( + domainSection); // нашли идентификатор предметной области объекта класса + } + } + return stringDomainSection; +} + +std::ofstream CheckDuplicateConstructionsAgent::createOutputFile(std::string & stringMainIdtf, ScAddr & classAddr) +{ + std::string fileName = "duplicate_file_for_" + stringMainIdtf; + + std::ofstream outputFile = checkDuplicateConstructionSearcher::openOrCreateFile(&m_context, classAddr, fileName); + + return outputFile; +} + +std::vector CheckDuplicateConstructionsAgent::createClassObjectsVector(ScAddr & classAddr) +{ + std::vector classObjects; + + ScIterator3Ptr const & objectClassIter = m_context.CreateIterator3(classAddr, ScType::ConstPermPosArc, ScType::Node); + while (objectClassIter->Next()) + classObjects.push_back(objectClassIter->Get(2)); + + return classObjects; +} + +void CheckDuplicateConstructionsAgent::checkDuplicateTriplets( + std::vector & classObjects, + std::ofstream & outputFile, + std::string & stringDomainSection) +{ + for (auto classObject : classObjects) + { + std::vector> triplets = + fillTripleVector(classObject); // заполняем вектор тройками + + for (auto triplet : triplets) // проходим по вектору кортежей + { + ScAddr relationObject = + std::get<2>(triplet); // проверяем связь с другим объектом, объектом, который не принадлежит исходному классу + + int numberOfDuplicateTriples = checkDuplicateRelationTriplets(relationObject, classObject); + + SC_LOG_DEBUG(numberOfDuplicateTriples); + + if (numberOfDuplicateTriples > 1) + createDuplicateTripletsInfo(classObject, relationObject, outputFile, stringDomainSection); + } + } +} + +void CheckDuplicateConstructionsAgent::checkDuplicateFives( + std::vector & classObjects, + std::ofstream & outputFile, + std::string & stringDomainSection) +{ + for (auto objectClass : classObjects) // проходим по всем объектам класса + { + std::vector> fives = fillFivesVector(objectClass); + + for (auto five : fives) // проходим по вектору кортежей + { + ScAddr relationObject = std::get<2>(five); + ScAddr relation = std::get<4>(five); + + int numberOfDuplicateFifths = checkDuplicateRelationFives( + relationObject, + objectClass, + relation); // проверяем связь с другим объектом, объектом, который не принадлежит исходному классу + + if (numberOfDuplicateFifths > 1) + createDuplicateFivesInfo(objectClass, relationObject, relation, outputFile, stringDomainSection); + } + } +} + +void CheckDuplicateConstructionsAgent::checkDuplicateQuasyRelations( + std::vector & classObjects, + std::ofstream & outputFile) +{ + for (auto objectClass : classObjects) + { + std::vector> tuples = fillQuasyRelationVector(objectClass); + + for (auto tuple : tuples) + { + ScAddr tupleObject = + std::get<2>(tuple); // проверяем связь с другим объектом, объектом, который не принадлежит исходному классу + ScAddr relation = std::get<4>(tuple); + + int numberOfDuplicateTuples = + checkDuplicateRelationQuasyRelations(tupleObject, objectClass, relation); // создаем счетчик повторений + + if (numberOfDuplicateTuples > 1) // если счётчик повторений больше 1, то записываем в файл все данные + createDuplicateQuasyRelationsInfo(objectClass, tupleObject, relation, outputFile); + } + } +} + +std::vector> CheckDuplicateConstructionsAgent::fillTripleVector(ScAddr & classObject) +{ + std::vector> triplets; + + ScIterator3Ptr const & triplesWithObjects = + m_context.CreateIterator3(classObject, ScType::ConstPermPosArc, ScType::Node); + + while (triplesWithObjects->Next()) + { + triplets.push_back( + std::make_tuple(triplesWithObjects->Get(0), triplesWithObjects->Get(1), triplesWithObjects->Get(2))); + } + + return triplets; +} + +std::vector> CheckDuplicateConstructionsAgent::fillFivesVector( + ScAddr & classObject) +{ + std::vector> fives; + + ScIterator5Ptr const & fivesWithObjects = m_context.CreateIterator5( + classObject, ScType::ConstPermPosArc, ScType::Node, ScType::ConstCommonArc, ScType::ConstPermPosArc); + + while (fivesWithObjects->Next()) + { + fives.push_back(std::make_tuple( + fivesWithObjects->Get(0), + fivesWithObjects->Get(1), + fivesWithObjects->Get(2), + fivesWithObjects->Get(3), + fivesWithObjects->Get( + 4))); // записываем в отдельный вектор кортежи из пятерок, чтобы потом проверить повторения + } + + return fives; +} + +std::vector> CheckDuplicateConstructionsAgent:: + fillQuasyRelationVector(ScAddr & classObject) +{ + std::vector> tuples; + + ScIterator5Ptr const & tupleIter = m_context.CreateIterator5( + classObject, ScType::ConstPermPosArc, ScType::NodeTuple, ScType::ConstCommonArc, ScType::ConstPermPosArc); + + while (tupleIter->Next()) + { + tuples.push_back( + std::make_tuple(tupleIter->Get(0), tupleIter->Get(1), tupleIter->Get(2), tupleIter->Get(3), tupleIter->Get(4))); + } + + return tuples; +} + +int CheckDuplicateConstructionsAgent::checkDuplicateRelationTriplets(ScAddr & relationObject, ScAddr & classObject) +{ + int numberOfDuplicateTriples = 0; + + ScIterator3Ptr const & tupleIter = m_context.CreateIterator3(classObject, ScType::ConstPermPosArc, relationObject); + + while (tupleIter->Next()) + numberOfDuplicateTriples++; + + return numberOfDuplicateTriples; +} + +int CheckDuplicateConstructionsAgent::checkDuplicateRelationFives( + ScAddr & relationObject, + ScAddr & classObject, + ScAddr & relation) +{ + int numberOfDuplicateFifths = 0; // создаем счетчик повторений + + ScIterator5Ptr const & tupleIter = + m_context.CreateIterator5(classObject, ScType::ConstPermPosArc, relationObject, ScType::ConstCommonArc, relation); + + while (tupleIter->Next()) + numberOfDuplicateFifths++; + + return numberOfDuplicateFifths; +} + +int CheckDuplicateConstructionsAgent::checkDuplicateRelationQuasyRelations( + ScAddr & tupleObject, + ScAddr & objectClass, + ScAddr & relation) +{ + int numberOfDuplicateTuples = 0; + + ScIterator5Ptr const & tupleIter = m_context.CreateIterator5( + objectClass, ScType::ConstPermPosArc, tupleObject, ScType::ConstCommonArc, ScType::ConstPermPosArc); + + if (tupleIter->Next()) + { + std::vector> tupleElements; + // создаем итератор на 3 по tuples + ScIterator3Ptr const & tupleElementsIter = + m_context.CreateIterator3(tupleObject, ScType::ConstPermPosArc, ScType::Node); + + if (tupleElementsIter->Next()) + { + // Создаем кортеж и добавляем его в вектор + tupleElements.push_back( + std::make_tuple(tupleElementsIter->Get(0), tupleElementsIter->Get(1), tupleElementsIter->Get(2))); + } + + int numberDuplicateTupleElements = 0; + for (auto tupleElement : tupleElements) + { + ScAddr relationObject = std::get<2>(tupleElement); + ScIterator3Ptr const & tupleIter = + m_context.CreateIterator3(relationObject, ScType::ConstPermPosArc, objectClass); + // создаем счетчик повторений + + if (tupleIter->Next()) + numberDuplicateTupleElements++; + } + + if (numberDuplicateTupleElements > 1) + numberOfDuplicateTuples++; + } + + return numberOfDuplicateTuples; +} + +void CheckDuplicateConstructionsAgent::createDuplicateTripletsInfo( + ScAddr & classObject, + ScAddr & relationObject, + std::ofstream & outputFile, + std::string & stringDomainSection) +{ + SC_LOG_ERROR("CheckDuplicateConstructionsAgent: duplication construction is found 1111111"); + + std::string stringObjectIdtf; + stringObjectIdtf = + m_context.GetElementSystemIdentifier(classObject); // нашли идентификатор предметной области объекта класса + + std::string stringRelationObject; + + stringRelationObject = m_context.GetElementSystemIdentifier(relationObject); + + outputFile << "Object: " << stringObjectIdtf << std::endl; + outputFile << ", domain section: " << stringDomainSection << std::endl; + outputFile << ", relation type: inclusion " << std::endl; + outputFile << "Inclusion object: " << stringRelationObject << std::endl; + + SC_LOG_ERROR("CheckDuplicateConstructionsAgent: duplication construction is found"); +} + +void CheckDuplicateConstructionsAgent::createDuplicateFivesInfo( + ScAddr & classObject, + ScAddr & relationObject, + ScAddr & relation, + std::ofstream & outputFile, + std::string & stringDomainSection) +{ + std::string stringObjectIdtf; + std::string stringRelationObject; + std::string stringRelation; + + stringObjectIdtf = + m_context.GetElementSystemIdentifier(classObject); // нашли идентификатор предметной области объекта класса + stringRelation = + m_context.GetElementSystemIdentifier(relation); + stringRelationObject = + m_context.GetElementSystemIdentifier(relationObject); + + outputFile << "Object: " << stringObjectIdtf; + outputFile << ", domain section: " << stringDomainSection; + outputFile << ", relation type: " << stringRelation; + outputFile << ", second domain: " << stringRelationObject; + outputFile.close(); + SC_LOG_ERROR("CheckDuplicateConstructionsAgent: duplication construction is found"); +} + +void CheckDuplicateConstructionsAgent::createDuplicateQuasyRelationsInfo( + ScAddr & classObject, + ScAddr & relationObject, + ScAddr & relation, + std::ofstream & outputFile) +{ + std::string stringObjectIdtf; + stringObjectIdtf = CommonUtils::getIdtf( + &m_context, + classObject, + ScKeynodes::nrel_main_idtf, + {VerificationConstants::LANG}); // нашли идентификатор предметной области объекта класса + + std::string stringDomainSection; + std::string stringRelationObject; + std::string stringRelation; + + ScIterator5Ptr const & subjectDomainIterator = m_context.CreateIterator5( + classObject, + ScType::ConstPermPosArc, + ScType::Node, + ScType::ConstCommonArc, + VerificationKeynodes::rrel_not_maximum_studied_object_class); + if (subjectDomainIterator->Next()) + { + stringRelation = + CommonUtils::getIdtf(&m_context, relation, ScKeynodes::nrel_main_idtf, {VerificationConstants::LANG}); + ScAddr domainSection = subjectDomainIterator->Get(2); + stringDomainSection = CommonUtils::getIdtf( + &m_context, + domainSection, + ScKeynodes::nrel_main_idtf, + {VerificationConstants::LANG}); // нашли идентификатор предметной области объекта класса + } + + outputFile << "Object: " << stringObjectIdtf; + outputFile << ", domain section: " << stringDomainSection; + outputFile << ", relation type: " << stringRelation; + outputFile << ", second domain: tuple"; + outputFile.close(); + SC_LOG_ERROR("CheckDuplicateConstructionsAgent: duplicate construction is found"); +} + +ScAddr CheckDuplicateConstructionsAgent::GetActionClass() const +{ + return VerificationKeynodes::action_check_duplicate_constructions; +} + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/agent/check-duplicate-constructions-agent.hpp b/platform-dependent-components/problem-solver/cxx/verification-module/agent/check-duplicate-constructions-agent.hpp new file mode 100644 index 00000000..be1e6eb2 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/agent/check-duplicate-constructions-agent.hpp @@ -0,0 +1,73 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#pragma once + +#include + +namespace verificationModule +{ +class CheckDuplicateConstructionsAgent : public ScActionInitiatedAgent +{ +public: + ScAddr GetActionClass() const override; + + ScResult DoProgram(ScActionInitiatedEvent const & event, ScAction & action) override; + +private: + std::string findDomainSectionIdtf( + ScAddr & classAddr, + std::string & stringDomainSection); + + std::ofstream createOutputFile(std::string & stringMainIdtf, ScAddr & classAddr); + + std::vector createClassObjectsVector(ScAddr & classAddr); + + void checkDuplicateTriplets( + std::vector & classObjects, + std::ofstream & outputFile, + std::string & stringDomainSection); + + void checkDuplicateFives( + std::vector & classObjects, + std::ofstream & outputFile, + std::string & stringDomainSection); + + void checkDuplicateQuasyRelations(std::vector & classObjects, std::ofstream & outputFile); + + std::vector> fillTripleVector(ScAddr & classObject); + + std::vector> fillFivesVector(ScAddr & classObject); + + std::vector> fillQuasyRelationVector(ScAddr & classObject); + + int checkDuplicateRelationTriplets(ScAddr & relationObject, ScAddr & classObject); + + void createDuplicateTripletsInfo( + ScAddr & classObject, + ScAddr & relationObject, + std::ofstream & outputFile, + std::string & stringDomainSection); + + int checkDuplicateRelationFives(ScAddr & relationObject, ScAddr & classObject, ScAddr & relation); + + void createDuplicateFivesInfo( + ScAddr & classObject, + ScAddr & relationObject, + ScAddr & relation, + std::ofstream & outputFile, + std::string & stringDomainSection); + + int checkDuplicateRelationQuasyRelations(ScAddr & tupleObject, ScAddr & objectClass, ScAddr & relation); + + void createDuplicateQuasyRelationsInfo( + ScAddr & classObject, + ScAddr & relationObject, + ScAddr & relation, + std::ofstream & outputFile); +}; + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-agent.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-agent.cpp new file mode 100644 index 00000000..dde505c1 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-agent.cpp @@ -0,0 +1,31 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ +#include +#include + +#include "constants/verification_constants.hpp" + +#include "keynodes/verification_keynodes.hpp" + +#include "not-enough-specified-objects-search-agent.hpp" + +using namespace utils; + +namespace verificationModule +{ + +ScResult SearchNotEnoughSpecifiedObjectsAgent::DoProgram(ScAction & action) +{ + const ScAddr parameter = action.GetArgument(0); + + return action.FinishSuccessfully(); +} + +ScAddr SearchNotEnoughSpecifiedObjectsAgent::GetActionClass() const +{ + return VerificationKeynodes::action_search_not_enough_specified_objects; +} +} // namespace verificationModule \ No newline at end of file diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-agent.hpp b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-agent.hpp new file mode 100644 index 00000000..fad8f360 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-agent.hpp @@ -0,0 +1,23 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#pragma once + +#include + +namespace verificationModule +{ +class SearchNotEnoughSpecifiedObjectsAgent : public ScActionInitiatedAgent +{ +public: + ScAddr GetActionClass() const override; + + ScResult DoProgram(ScAction & action) override; + +private: +}; + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-classes-search-agent.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-classes-search-agent.cpp new file mode 100644 index 00000000..9c5c2157 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-classes-search-agent.cpp @@ -0,0 +1,29 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ +#include +#include + +#include "constants/verification_constants.hpp" + +#include "keynodes/verification_keynodes.hpp" + +#include "not-enough-specified-classes-search-agent.hpp" + +using namespace utils; + +namespace verificationModule +{ + +ScResult SearchNotEnoughSpecifiedClassesAgent::DoProgram(ScAction & action) +{ + return action.FinishSuccessfully(); +} + +ScAddr SearchNotEnoughSpecifiedClassesAgent::GetActionClass() const +{ + return VerificationKeynodes::action_search_not_enough_specified_classes; +} +} // namespace verificationModule \ No newline at end of file diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-classes-search-agent.hpp b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-classes-search-agent.hpp new file mode 100644 index 00000000..7276b252 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-classes-search-agent.hpp @@ -0,0 +1,23 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#pragma once + +#include + +namespace verificationModule +{ +class SearchNotEnoughSpecifiedClassesAgent : public ScActionInitiatedAgent +{ +public: + ScAddr GetActionClass() const override; + + ScResult DoProgram(ScAction & action) override; + +private: +}; + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-relations-search-agent.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-relations-search-agent.cpp new file mode 100644 index 00000000..e7004445 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-relations-search-agent.cpp @@ -0,0 +1,29 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ +#include +#include + +#include "constants/verification_constants.hpp" + +#include "keynodes/verification_keynodes.hpp" + +#include "not-enough-specified-relations-search-agent.hpp" + +using namespace utils; + +namespace verificationModule +{ + +ScResult SearchNotEnoughSpecifiedRelationsAgent::DoProgram(ScAction & action) +{ + return action.FinishSuccessfully(); +} + +ScAddr SearchNotEnoughSpecifiedRelationsAgent::GetActionClass() const +{ + return VerificationKeynodes::action_search_not_enough_specified_relations; +} +} // namespace verificationModule \ No newline at end of file diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-relations-search-agent.hpp b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-relations-search-agent.hpp new file mode 100644 index 00000000..4f3586f9 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-relations-search-agent.hpp @@ -0,0 +1,23 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#pragma once + +#include + +namespace verificationModule +{ +class SearchNotEnoughSpecifiedRelationsAgent : public ScActionInitiatedAgent +{ +public: + ScAddr GetActionClass() const override; + + ScResult DoProgram(ScAction & action) override; + +private: +}; + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-structures-search-agent.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-structures-search-agent.cpp new file mode 100644 index 00000000..aea66c38 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-structures-search-agent.cpp @@ -0,0 +1,29 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ +#include +#include + +#include "constants/verification_constants.hpp" + +#include "keynodes/verification_keynodes.hpp" + +#include "not-enough-specified-structures-search-agent.hpp" + +using namespace utils; + +namespace verificationModule +{ + +ScResult SearchNotEnoughSpecifiedStructuresAgent::DoProgram(ScAction & action) +{ + return action.FinishSuccessfully(); +} + +ScAddr SearchNotEnoughSpecifiedStructuresAgent::GetActionClass() const +{ + return VerificationKeynodes::action_search_not_enough_specified_structures; +} +} // namespace verificationModule \ No newline at end of file diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-structures-search-agent.hpp b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-structures-search-agent.hpp new file mode 100644 index 00000000..6e90294a --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/agent/not-enough-specified-objects-search-module/not-enough-specified-structures-search-agent.hpp @@ -0,0 +1,23 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#pragma once + +#include + +namespace verificationModule +{ +class SearchNotEnoughSpecifiedStructuresAgent : public ScActionInitiatedAgent +{ +public: + ScAddr GetActionClass() const override; + + ScResult DoProgram(ScAction & action) override; + +private: +}; + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/constants/verification_constants.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/constants/verification_constants.cpp new file mode 100644 index 00000000..67668e36 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/constants/verification_constants.cpp @@ -0,0 +1,16 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#include "verification_constants.hpp" +#include "keynodes/verification_keynodes.hpp" + +namespace verificationModule +{ +ScAddr const VerificationConstants::LANG = VerificationKeynodes::lang_en; + +std::string const FileConfigs::FILE_PATH = "file_path"; + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/constants/verification_constants.hpp b/platform-dependent-components/problem-solver/cxx/verification-module/constants/verification_constants.hpp new file mode 100644 index 00000000..a76aa292 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/constants/verification_constants.hpp @@ -0,0 +1,25 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#pragma once + +#include "sc-memory/sc_memory.hpp" + +namespace verificationModule +{ +class VerificationConstants +{ +public: + static ScAddr const LANG; +}; + +class FileConfigs +{ +public: + static std::string const FILE_PATH; +}; + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/generator/verification_generator.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/generator/verification_generator.cpp new file mode 100644 index 00000000..83c7c6ce --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/generator/verification_generator.cpp @@ -0,0 +1,31 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#include "sc-agents-common/utils/CommonUtils.hpp" + +#include "keynodes/verification_keynodes.hpp" + +#include "verification_generator.hpp" + +namespace verificationModule +{ +std::ofstream verificationGenerator::generateDuplicationFile( + ScMemoryContext * context, + ScAddr const & classAddr, + std::string const & filename) +{ + std::ofstream outputFile = std::ofstream(filename, std::ios::app); + + ScAddr const & fileAddr = context->GenerateLink(ScType::ConstNodeLink); + context->SetLinkContent(fileAddr, filename); + ScAddr const & edge = context->GenerateConnector(ScType::ConstCommonArc, classAddr, fileAddr); + ScAddr const & relationEdge = + context->GenerateConnector(ScType::ConstPermPosArc, VerificationKeynodes::nrel_duplicate_construction_file, edge); + + return outputFile; +} + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/generator/verification_generator.hpp b/platform-dependent-components/problem-solver/cxx/verification-module/generator/verification_generator.hpp new file mode 100644 index 00000000..21a1fcd8 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/generator/verification_generator.hpp @@ -0,0 +1,25 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#pragma once + +#include + +#include "sc-memory/sc_memory.hpp" + +namespace verificationModule +{ +class verificationGenerator +{ +public: + explicit verificationGenerator(ScMemoryContext * context); + + static std::ofstream generateDuplicationFile(ScMemoryContext * context, ScAddr const &, std::string const & filename); + +private: + ScMemoryContext * context; +}; +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/keynodes/verification_keynodes.hpp b/platform-dependent-components/problem-solver/cxx/verification-module/keynodes/verification_keynodes.hpp new file mode 100644 index 00000000..ab261bc4 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/keynodes/verification_keynodes.hpp @@ -0,0 +1,44 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#pragma once + +#include + +namespace verificationModule +{ + +class VerificationKeynodes : public ScKeynodes +{ +public: + static inline ScKeynode const action_check_duplicate_constructions{ + "action_check_duplicate_constructions", + ScType::ConstNodeClass}; + static inline ScKeynode const action_search_not_enough_specified_objects{ + "action_search_not_enough_specified_objects", + ScType::ConstNodeClass}; + static inline ScKeynode const action_search_not_enough_specified_classes{ + "action_search_not_enough_specified_classes", + ScType::ConstNodeClass}; + static inline ScKeynode const action_search_not_enough_specified_relations{ + "action_search_not_enough_specified_relations", + ScType::ConstNodeClass}; + static inline ScKeynode const action_search_not_enough_specified_structures{ + "action_search_not_enough_specified_structures", + ScType::ConstNodeClass}; + static inline ScKeynode const nrel_duplicate_construction_file{ + "nrel_duplicate_construction_file", + ScType::ConstNodeNonRole}; + static inline ScKeynode const rrel_not_maximum_studied_object_class{ + "rrel_not_maximum_studied_object_class", + ScType::ConstNodeRole}; + static inline ScKeynode const rrel_maximum_studied_object_class{ + "rrel_maximum_studied_object_class", + ScType::ConstNodeRole}; + static inline ScKeynode const lang_en{"lang_en", ScType::NodeClass}; +}; + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/searcher/check_duplicate_constructions_searcher.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/searcher/check_duplicate_constructions_searcher.cpp new file mode 100644 index 00000000..6b19bd88 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/searcher/check_duplicate_constructions_searcher.cpp @@ -0,0 +1,55 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#include "filesystem" +#include "optional" + +#include "sc-agents-common/utils/CommonUtils.hpp" +#include "sc-memory/sc_keynodes.hpp" + +#include "constants/verification_constants.hpp" + +#include "keynodes/verification_keynodes.hpp" + +#include "generator/verification_generator.hpp" + +#include "check_duplicate_constructions_searcher.hpp" + +namespace verificationModule +{ +checkDuplicateConstructionSearcher::checkDuplicateConstructionSearcher(ScMemoryContext * context) + : context(context) +{ +} + +std::ofstream checkDuplicateConstructionSearcher::openOrCreateFile( + ScMemoryContext * context, + ScAddr & classAddr, + std::string const & filename) +{ + ScAddr fileAddr; + ScIterator5Ptr const & fileIterator = context->CreateIterator5( + classAddr, + ScType::ConstPermPosArc, + ScType::Node, + ScType::ConstCommonArc, + VerificationKeynodes::nrel_duplicate_construction_file); + if (fileIterator->Next()) + { + fileAddr = fileIterator->Get(2); + std::string fileIdtf = + utils::CommonUtils::getIdtf(context, fileAddr, ScKeynodes::nrel_main_idtf, {VerificationConstants::LANG}); + std::string outputFile = filename + fileIdtf; + return std::ofstream(outputFile, std::ios::app); + } + else + { + std::ofstream outputFile = verificationGenerator::generateDuplicationFile(context, classAddr, filename); + return outputFile; + } +} + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/searcher/check_duplicate_constructions_searcher.hpp b/platform-dependent-components/problem-solver/cxx/verification-module/searcher/check_duplicate_constructions_searcher.hpp new file mode 100644 index 00000000..cdfd6965 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/searcher/check_duplicate_constructions_searcher.hpp @@ -0,0 +1,26 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#pragma once + +#include + +#include "sc-memory/sc_addr.hpp" +#include "sc-memory/sc_memory.hpp" + +namespace verificationModule +{ +class checkDuplicateConstructionSearcher +{ +public: + explicit checkDuplicateConstructionSearcher(ScMemoryContext * context); + + static std::ofstream openOrCreateFile(ScMemoryContext * context, ScAddr & classAddr, std::string const & filename); + +private: + ScMemoryContext * context; +}; +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/classWithoutDuplicateFile.scs b/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/classWithoutDuplicateFile.scs new file mode 100644 index 00000000..e2a73ba8 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/classWithoutDuplicateFile.scs @@ -0,0 +1,42 @@ +test_question_node +<- action; +-> rrel_1: classAddr; +<- action_check_duplicate_constructions;; + +sc_node_class +-> classAddr;; + +sc_node +-> object1; +-> object2; +-> object3;; + +classAddr -> object1;; +classAddr -> object2;; + +object1 -> object3;; +object2 -> object3;; + +object1 +=> nrel_main_idtf: + [Объект 1] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 1] + (* <- lang_en;; *); + +object2 +=> nrel_main_idtf: + [Объект 2] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 2] + (* <- lang_en;; *); + +object3 +=> nrel_main_idtf: + [Объект 3] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 3] + (* <- lang_en;; *); \ No newline at end of file diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/doesntHaveComponent.scs b/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/doesntHaveComponent.scs new file mode 100644 index 00000000..9aef8087 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/doesntHaveComponent.scs @@ -0,0 +1,7 @@ +test_action_node +<- action; +-> rrel_1: classAddr; +<- action_check_duplicate_constructions;; + +sc_node_class +-> classAddr;; \ No newline at end of file diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/duplicateFileIsExist.scs b/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/duplicateFileIsExist.scs new file mode 100644 index 00000000..9d8c38b8 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/duplicateFileIsExist.scs @@ -0,0 +1,46 @@ +test_question_node +<- action; +-> rrel_1: classAddr; +<- action_check_duplicate_constructions;; + +sc_node_class +-> classAddr;; + +sc_node +-> object1; +-> object2; +-> object3; +-> fileAddr;; + +classAddr -> object1;; +classAddr -> object2;; + +classAddr +=> nrel_duplicate_construction_file: fileAddr;; + +object1 -> object3;; +object2 -> object3;; + +object1 +=> nrel_main_idtf: + [Объект 1] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 1] + (* <- lang_en;; *); + +object2 +=> nrel_main_idtf: + [Объект 2] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 2] + (* <- lang_en;; *); + +object3 +=> nrel_main_idtf: + [Объект 3] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 3] + (* <- lang_en;; *); \ No newline at end of file diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/duplicateFives.scs b/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/duplicateFives.scs new file mode 100644 index 00000000..b540c60f --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/duplicateFives.scs @@ -0,0 +1,59 @@ +test_question_node +<- action; +-> rrel_1: classAddr; +<- action_check_duplicate_constructions;; + +sc_node_class +-> classAddr;; + +sc_norole_relation +<- nrel_creation;; + +sc_node +-> object1; +-> object2; +-> object3;; + +classAddr -> object1;; +classAddr -> object2;; + +object1 +=> nrel_creation: object3;; + +object1 +=> nrel_creation: object3;; + +object2 +=> nrel_creation: object3;; + +object1 +=> nrel_main_idtf: + [Объект 1] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 1] + (* <- lang_en;; *); + +object2 +=> nrel_main_idtf: + [Объект 2] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 2] + (* <- lang_en;; *); + +object3 +=> nrel_main_idtf: + [Объект 3] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 3] + (* <- lang_en;; *); + +nrel_creation +=> nrel_main_idtf: + [Создание] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Creation] + (* <- lang_en;; *); diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/duplicateTriplets.scs b/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/duplicateTriplets.scs new file mode 100644 index 00000000..a20f2de6 --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/test/testStructures/duplicateTriplets.scs @@ -0,0 +1,43 @@ +test_question_node +<- action; +-> rrel_1: classAddr; +<- action_check_duplicate_constructions;; + +sc_node_class +-> classAddr;; + +classAddr -> object1;; +classAddr -> object2;; + +object1 -> object3;; +object1 -> object3;; +object2 -> object3;; + +sc_node +-> object1; +-> object2; +-> object3;; + +object1 +=> nrel_main_idtf: + [Объект 1] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 1] + (* <- lang_en;; *); + +object2 +=> nrel_main_idtf: + [Объект 2] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 2] + (* <- lang_en;; *); + +object3 +=> nrel_main_idtf: + [Объект 3] + (* <- lang_ru;; *); +=> nrel_main_idtf: + [Object 3] + (* <- lang_en;; *); \ No newline at end of file diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/test/tests.cmake b/platform-dependent-components/problem-solver/cxx/verification-module/test/tests.cmake new file mode 100644 index 00000000..5751ba6d --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/test/tests.cmake @@ -0,0 +1,11 @@ +make_tests_from_folder(${CMAKE_CURRENT_LIST_DIR}/units + NAME verification-module-test-starter + DEPENDS sc-memory sc-core sc-builder-lib verification-module + INCLUDES ${SC_MEMORY_SRC} ${SC_BUILDER_PATH} +) + +add_definitions(-DVERIFICATION_MODULE_TEST_SRC_PATH="${CMAKE_CURRENT_LIST_DIR}") + +if(${SC_CLANG_FORMAT_CODE}) + target_clangformat_setup(verification-module-test-starter) +endif() diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/test/units/check_duplicate_constructions_agent_test.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/test/units/check_duplicate_constructions_agent_test.cpp new file mode 100644 index 00000000..1a76fcce --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/test/units/check_duplicate_constructions_agent_test.cpp @@ -0,0 +1,50 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#include +#include +#include + +#include "sc-agents-common/utils/CommonUtils.hpp" +#include "sc-agents-common/utils/IteratorUtils.hpp" + +#include +#include "sc-memory/utils/sc_base64.hpp" + +#include + +#include "keynodes/verification_keynodes.hpp" +#include "agent/check-duplicate-constructions-agent.hpp" + +using namespace verificationModule; + +namespace VerificationModuleTest +{ +ScsLoader loader; +std::string const TEST_FILES_DIR_PATH = VERIFICATION_MODULE_TEST_SRC_PATH "/testStructures/"; + +int const WAIT_TIME = 1000; + +using CheckDuplicateConstructionsAgentTest = ScMemoryTest; + +TEST_F(CheckDuplicateConstructionsAgentTest, DoesntHaveComponentTest) +{ + ScAgentContext & context = *m_ctx; + + loader.loadScsFile(context, TEST_FILES_DIR_PATH + "doesntHaveComponent.scs"); + ScAddr const & test_action_node = context.SearchElementBySystemIdentifier("test_action_node"); + EXPECT_TRUE(context.IsElement(test_action_node)); + + ScAction testAction = context.ConvertToAction(test_action_node); + + context.SubscribeAgent(); + + EXPECT_TRUE(testAction.InitiateAndWait(WAIT_TIME)); + EXPECT_TRUE(testAction.IsFinishedSuccessfully()); + context.UnsubscribeAgent(); +} + +} // namespace VerificationModuleTest diff --git a/platform-dependent-components/problem-solver/cxx/verification-module/verification_module.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/verification_module.cpp new file mode 100644 index 00000000..340bb0bd --- /dev/null +++ b/platform-dependent-components/problem-solver/cxx/verification-module/verification_module.cpp @@ -0,0 +1,17 @@ +/* + * This source file is part of an OSTIS project. For the latest info, see http://ostis.net + * Distributed under the MIT License + * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) + */ + +#include "verification_module.hpp" + +#include "sc-memory/sc_memory.hpp" + +#include "keynodes/verification_keynodes.hpp" + +#include "agent/check-duplicate-constructions-agent.hpp" + +using namespace verificationModule; + +SC_MODULE_REGISTER(VerificationModule)->Agent(); diff --git a/platform-dependent-components/problem-solver/cxx/identifiers-module/keynodes/identifiers_keynodes.cpp b/platform-dependent-components/problem-solver/cxx/verification-module/verification_module.hpp similarity index 54% rename from platform-dependent-components/problem-solver/cxx/identifiers-module/keynodes/identifiers_keynodes.cpp rename to platform-dependent-components/problem-solver/cxx/verification-module/verification_module.hpp index b2f76bae..4e174e82 100644 --- a/platform-dependent-components/problem-solver/cxx/identifiers-module/keynodes/identifiers_keynodes.cpp +++ b/platform-dependent-components/problem-solver/cxx/verification-module/verification_module.hpp @@ -4,12 +4,15 @@ * (See accompanying file COPYING.MIT or copy at http://opensource.org/licenses/MIT) */ -#include "identifiers_keynodes.hpp" +#pragma once -#include "sc-memory/sc_memory.hpp" +#include "sc-memory/sc_module.hpp" -namespace identifiersModule +namespace verificationModule { -ScAddr IdentifiersKeynodes::action_find_identifiers; -} // namespace identifiersModule +class VerificationModule : public ScModule +{ +}; + +} // namespace verificationModule diff --git a/platform-dependent-components/problem-solver/py/requirements.txt b/platform-dependent-components/problem-solver/py/requirements.txt index 50300296..f7794bfd 100644 --- a/platform-dependent-components/problem-solver/py/requirements.txt +++ b/platform-dependent-components/problem-solver/py/requirements.txt @@ -1 +1,2 @@ -py-sc-kpm==0.2.0 +py-sc-kpm==0.3.0 +py-sc-client==0.4.0 \ No newline at end of file diff --git a/sc-models/knowledge-base/kb-verification-module/concepts/concept_text_file.scs b/sc-models/knowledge-base/kb-verification-module/concepts/concept_text_file.scs new file mode 100644 index 00000000..00d8e870 --- /dev/null +++ b/sc-models/knowledge-base/kb-verification-module/concepts/concept_text_file.scs @@ -0,0 +1,28 @@ +concept_text_file +<- sc_node_class; +=> nrel_main_idtf: + [текстовый файл] (* <- lang_ru;; *); + [text file] (* <- lang_en;; *); +<- rrel_key_sc_element: + ... + (* + <- definition;; + => nrel_main_idtf: + [Опр. (текстовый файл)] + (* <- lang_ru;; *); + [Def. (text file)] + (* <- lang_en;; *);; + => nrel_sc_text_translation: + { + rrel_example: + [Текстовый файл — это формат файла, используемый для хранения текста в цифровом формате.] + (* <- lang_ru;; *); + rrel_example: + [Text file is a file format used to store text in a digital format.] + (* <- lang_en;; *) + };; + => nrel_using_constants: + { + file + };; + *);; diff --git a/sc-models/knowledge-base/kb-verification-module/relations/nrel_duplicate_construction_file.scs b/sc-models/knowledge-base/kb-verification-module/relations/nrel_duplicate_construction_file.scs new file mode 100644 index 00000000..16b82bdc --- /dev/null +++ b/sc-models/knowledge-base/kb-verification-module/relations/nrel_duplicate_construction_file.scs @@ -0,0 +1,47 @@ +nrel_duplicate_construction_file +<- sc_node_norole_relation; +=> nrel_main_idtf: + [файл дублирующихся конструкций*] (* <- lang_ru;; *); + [duplicate constructions file*] (* <- lang_en;; *); +<- relation; +<- binary_relation; +<- oriented_relation; +<- antireflexive_relation; +<- asymmetric_relation; +<- antitransitive_relation; +=> nrel_first_domain: sc_node_class; +=> nrel_second_domain: concept_text_file; +=> nrel_definitional_domain: + ... + (* + <= nrel_combination: + { + concept_text_file; + sc_node_class + };; + *); +<- rrel_key_sc_element: + ... + (* + => nrel_main_idtf: + [Опр. (файл дублирующихся конструкций*)] + (* <- lang_ru;; *); + [Def. (duplicate constructions file*)] + (* <- lang_en;; *);; + <- definition;; + => nrel_sc_text_translation: + { + rrel_example: + [Файл дублирующихся конструкций* — бинарное отношение, связывающее класс сущности с текстовым файлом, куда записываются дублирующиеся объекты, принадлежащие этому классу сущностей.] + (* <- lang_ru;; *); + rrel_example: + [Duplicate constructions file* is a binary relation that connects an sc node class to a text file where duplicate objects belonging to that entity class are written.] + (* <- lang_en;; *) + };; + => nrel_using_constants: + { + binary_relation; + sc_node_class; + concept_text_file + };; + *);; diff --git a/sc-models/knowledge-base/kb-verification-module/subject_domain_of_actions_and_tasks/concepts/action_check_duplicate_constructions.scs b/sc-models/knowledge-base/kb-verification-module/subject_domain_of_actions_and_tasks/concepts/action_check_duplicate_constructions.scs new file mode 100644 index 00000000..a79128a0 --- /dev/null +++ b/sc-models/knowledge-base/kb-verification-module/subject_domain_of_actions_and_tasks/concepts/action_check_duplicate_constructions.scs @@ -0,0 +1,22 @@ +action_check_duplicate_constructions +<- sc_node_class; +=> nrel_main_idtf: + [действие. проверить дублирующиеся конструкции в БЗ] + (* <- lang_ru;; *); + [action. check duplicate constructions] + (* <- lang_en;; *); +<- actions_class; +<- atomic_action_class; +<- rrel_key_sc_element: + ... + (* + <- definition;; + => nrel_sc_text_translation: + { + rrel_example: + [Действие. проверить дублирующиеся конструкции в БЗ - это действие по выявлению дублирующихся конструкций в базе знаний.](* <- lang_ru;; *); + + rrel_example: + [Action. check duplicate constructions is an action to check duplicate constructions in the knowledge base.](* <- lang_en;; *) + };; + *);; diff --git a/sc-models/knowledge-base/kb-verification-module/subject_domain_of_actions_and_tasks/relations/rrel_dynamic_argument.scs b/sc-models/knowledge-base/kb-verification-module/subject_domain_of_actions_and_tasks/relations/rrel_dynamic_argument.scs new file mode 100644 index 00000000..812c72b5 --- /dev/null +++ b/sc-models/knowledge-base/kb-verification-module/subject_domain_of_actions_and_tasks/relations/rrel_dynamic_argument.scs @@ -0,0 +1,17 @@ +rrel_dynamic_argument +=> nrel_main_idtf: + [динамический аргумент'] (* <- lang_ru;; *); + [dynamic argument'] (* <- lang_en;; *); +<- sc_node_role_relation; +<- rrel_key_sc_element: ... + (* + <- explanation;; + => nrel_sc_text_translation: + { + rrel_example: + [Динамический аргумент' не обрабатывается явно при интерпретации, обрабатывается его значение. Значение динамического аргумента’ может меняться в ходе интерпретации программы.](* <- lang_ru;; *); + + rrel_example: + [Dynamic argument' is not explicitly processed during interpretation; its value is processed. The value of the dynamic argument may change during program interpretation.](* <- lang_en;; *) + };; + *);; diff --git a/sc-models/knowledge-base/kb-verification-module/subject_domain_of_actions_and_tasks/subject_domain_of_actions_and_tasks.scs b/sc-models/knowledge-base/kb-verification-module/subject_domain_of_actions_and_tasks/subject_domain_of_actions_and_tasks.scs new file mode 100644 index 00000000..8e42b50b --- /dev/null +++ b/sc-models/knowledge-base/kb-verification-module/subject_domain_of_actions_and_tasks/subject_domain_of_actions_and_tasks.scs @@ -0,0 +1,7 @@ +subject_domain_of_actions_and_tasks +<- sc_node_struct; +<- subject_domain; +-> rrel_not_maximum_studied_object_class: + action_check_duplicate_constructions; +-> rrel_explored_relation: + c;; diff --git a/sc-models/user-interface/kb/core/find_full_semantic_square/ui_menu_view_full_semantic_square_content.scs b/sc-models/user-interface/kb/core/find_full_semantic_square/ui_menu_view_full_semantic_square_content.scs index e61d6c3d..fe61d25d 100755 --- a/sc-models/user-interface/kb/core/find_full_semantic_square/ui_menu_view_full_semantic_square_content.scs +++ b/sc-models/user-interface/kb/core/find_full_semantic_square/ui_menu_view_full_semantic_square_content.scs @@ -26,11 +26,11 @@ ui_menu_view_full_semantic_neighborhood ui_menu_view_full_semantic_neighborhood => ui_nrel_command_template: [* - question_search_full_semantic_neighborhood _-> ._question_search_full_semantic_neighborhood_instance + action_search_full_semantic_neighborhood _-> ._action_search_full_semantic_neighborhood_instance (* _-> ui_arg_1;; *);; - ._question_search_full_semantic_neighborhood_instance _<- question;; + ._action_search_full_semantic_neighborhood_instance <-_ action;; *];; ui_menu_view_full_semantic_neighborhood => ui_nrel_command_lang_template: [Что такое $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/core/section_subjdomain_informational_structures_not_sc_code/section_subjdomain_informational_structures_not_sc_code_content.scs b/sc-models/user-interface/kb/core/section_subjdomain_informational_structures_not_sc_code/section_subjdomain_informational_structures_not_sc_code_content.scs index e7fa4ad4..d728f66d 100755 --- a/sc-models/user-interface/kb/core/section_subjdomain_informational_structures_not_sc_code/section_subjdomain_informational_structures_not_sc_code_content.scs +++ b/sc-models/user-interface/kb/core/section_subjdomain_informational_structures_not_sc_code/section_subjdomain_informational_structures_not_sc_code_content.scs @@ -7,7 +7,7 @@ subjdomain_informational_structures_not_sc_code [Subjdomain informational structures not sc-code] (* <- lang_en;; *); <- subject_domain; -<- sc_node_struct; +<- sc_node_structure; <- structure; -> rrel_maximum_studied_object_class: file; @@ -22,7 +22,7 @@ subjdomain_informational_structures_not_sc_code -> rrel_explored_relation: nrel_sc_text_translation;; -file <- sc_node_not_relation; +file <- sc_node_class; => nrel_main_idtf: [файл] @@ -56,7 +56,7 @@ file <- sc_node_not_relation; *);; *);; -lang_external <- sc_node_not_relation; +lang_external <- sc_node_class; => nrel_main_idtf: [внешний язык] @@ -87,7 +87,7 @@ lang_external <- sc_node_not_relation; *);; -languages <- sc_node_not_relation; +languages <- sc_node_class; => nrel_main_idtf: [естественный язык] (* <- lang_ru;; *); @@ -119,7 +119,7 @@ languages <- sc_node_not_relation; *);; lang_ru -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [Русский язык] (* <- lang_ru;; *); @@ -127,7 +127,7 @@ lang_ru (* <- lang_en;; *);; lang_en -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [Английский язык] (* <- lang_ru;; *); @@ -135,7 +135,7 @@ lang_en (* <- lang_en;; *);; nrel_sc_text_translation -<- sc_node_norole_relation; +<- sc_node_non_role_relation; <- quasybinary_relation; => nrel_main_idtf: [трансляция sc-текста*] @@ -175,7 +175,7 @@ nrel_sc_text_translation *);; *);; -image <- sc_node_not_relation; +image <- sc_node_class; => nrel_main_idtf: [изображение] @@ -191,7 +191,7 @@ image <- sc_node_not_relation; <= nrel_inclusion: file;; -class_of_syntactically_equivalent_information_structures <- sc_node_not_relation; +class_of_syntactically_equivalent_information_structures <- sc_node_class; => nrel_main_idtf: [класс синтаксически эквивалентных информационных конструкций] @@ -218,7 +218,7 @@ class_of_syntactically_equivalent_information_structures <- sc_node_not_relation *);; -maximum_class_of_syntactically_equivalent_information_structures <- sc_node_not_relation; +maximum_class_of_syntactically_equivalent_information_structures <- sc_node_class; => nrel_main_idtf: [максимальный класс синтаксически эквивалентных информационных конструкций] diff --git a/sc-models/user-interface/kb/core/section_subject_domain_of_sc_identifiers/section_subjdomain_sc_identifiers_content.scs b/sc-models/user-interface/kb/core/section_subject_domain_of_sc_identifiers/section_subjdomain_sc_identifiers_content.scs index da172ff7..f707541e 100755 --- a/sc-models/user-interface/kb/core/section_subject_domain_of_sc_identifiers/section_subjdomain_sc_identifiers_content.scs +++ b/sc-models/user-interface/kb/core/section_subject_domain_of_sc_identifiers/section_subjdomain_sc_identifiers_content.scs @@ -6,7 +6,7 @@ subject_domain_of_sc_identifiers [subject domain of signs that are not the texts elements of sc-code] (* <- lang_en;; *); <- subject_domain; -<- sc_node_struct; +<- sc_node_structure; <- structure; -> rrel_maximum_studied_object_class: sc_identifier; -> rrel_not_maximum_studied_object_class: @@ -28,7 +28,7 @@ subject_domain_of_sc_identifiers nrel_external_sc_identifiers_sequence;; sc_identifier -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [идентификатор] (* <- lang_ru;; *); @@ -64,7 +64,7 @@ sc_identifier };; string_sc_identifier -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [строковый идентификатор] (* <- lang_ru;; *); @@ -92,7 +92,7 @@ string_sc_identifier };; non_string_sc_identifier -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [нестроковый идентификатор] (* <- lang_ru;; *); @@ -115,7 +115,7 @@ non_string_sc_identifier *);; atomic_sc_identifier -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [атомарный идентификатор] (* <- lang_ru;; *); @@ -140,7 +140,7 @@ atomic_sc_identifier "file://content_html/example_for_atomic_sc_identifier.html" (* => nrel_format: format_html;; *);; non_atomic_sc_identifier -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [неатомарный идентификатор] (* <- lang_ru;; *); @@ -188,7 +188,7 @@ non_atomic_sc_identifier => nrel_strict_inclusion: sc_identifier_operation;; sc_identifier_contour -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [идентификатор-контур] (* <- lang_ru;; *); @@ -217,7 +217,7 @@ sc_identifier_contour *);; sc_identifier_file -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [идентификатор-файл] (* <- lang_ru;; *); @@ -250,7 +250,7 @@ sc_identifier_file *);; sc_identifier_set -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [идентификатор-множество] (* <- lang_ru;; *); @@ -288,7 +288,7 @@ sc_identifier_set *);; sc_identifier_tuple_set -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [идентификатор-кортеж] (* <- lang_ru;; *); @@ -325,7 +325,7 @@ sc_identifier_tuple_set *);; sc_identifier_operation -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [идентификатор-операция] (* <- lang_ru;; *); @@ -362,7 +362,7 @@ sc_identifier_operation *);; nrel_idtf -<- sc_node_norole_relation; +<- sc_node_non_role_relation; <- identification_relation; => nrel_main_idtf: [идентификатор*] @@ -401,7 +401,7 @@ nrel_idtf *);; nrel_main_idtf -<- sc_node_norole_relation; +<- sc_node_non_role_relation; <- identification_relation; => nrel_main_idtf: [основной идентификатор*] @@ -439,7 +439,7 @@ nrel_main_idtf *);; nrel_system_identifier -<- sc_node_norole_relation; +<- sc_node_non_role_relation; <- identification_relation; => nrel_main_idtf: [системный идентификатор*] @@ -477,7 +477,7 @@ nrel_system_identifier *);; system_sc_identifier -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [системный идентификатор] (* <- lang_ru;; *); @@ -501,7 +501,7 @@ system_sc_identifier *);; identification_relation -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [отношение идентификации] (* <- lang_ru;; *); @@ -509,7 +509,7 @@ identification_relation (* <- lang_en;; *);; nrel_external_sc_identifiers_sequence -<- sc_node_norole_relation; +<- sc_node_non_role_relation; => nrel_main_idtf: [последовательность внешних идентификаторов*] (* <- lang_ru;; *); diff --git a/sc-models/user-interface/kb/core/ui/languages/ui_external_languages.scs b/sc-models/user-interface/kb/core/ui/languages/ui_external_languages.scs index aa46b2c3..6fa88d92 100644 --- a/sc-models/user-interface/kb/core/ui/languages/ui_external_languages.scs +++ b/sc-models/user-interface/kb/core/ui/languages/ui_external_languages.scs @@ -1,9 +1,9 @@ -ui_external_languages <- sc_node_not_relation;; +ui_external_languages <- sc_node_class;; ui_external_languages -> scg_code; scn_code;; nrel_answer -<- sc_node_norole_relation;; +<- sc_node_non_role_relation;; nrel_authors -<- sc_node_norole_relation;; +<- sc_node_non_role_relation;; diff --git a/sc-models/user-interface/kb/core/ui/menu/ui_main_menu.scs b/sc-models/user-interface/kb/core/ui/menu/ui_main_menu.scs index e3fe2bc2..9ee55ea9 100644 --- a/sc-models/user-interface/kb/core/ui/menu/ui_main_menu.scs +++ b/sc-models/user-interface/kb/core/ui/menu/ui_main_menu.scs @@ -1,4 +1,4 @@ -ui_main_menu <- sc_node_not_relation;; +ui_main_menu <- sc_node_class;; ui_main_menu => nrel_main_idtf: [Главное меню] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/core/ui/ui_expert_mode.scs b/sc-models/user-interface/kb/core/ui/ui_expert_mode.scs index 2f91e70f..3f000976 100644 --- a/sc-models/user-interface/kb/core/ui/ui_expert_mode.scs +++ b/sc-models/user-interface/kb/core/ui/ui_expert_mode.scs @@ -1,5 +1,5 @@ ui_expert_mode -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [Экспертный режим] (* <- lang_ru;; *); diff --git a/sc-models/user-interface/kb/core/ui/ui_nrel_command_lang_template.scs b/sc-models/user-interface/kb/core/ui/ui_nrel_command_lang_template.scs index fd1eb854..557c10bf 100644 --- a/sc-models/user-interface/kb/core/ui/ui_nrel_command_lang_template.scs +++ b/sc-models/user-interface/kb/core/ui/ui_nrel_command_lang_template.scs @@ -1,2 +1,2 @@ -ui_nrel_command_lang_template <- sc_node_norole_relation;; +ui_nrel_command_lang_template <- sc_node_non_role_relation;; ui_nrel_command_lang_template => nrel_main_idtf: [шаблон идентификатора на естественном языке*] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/core/ui/ui_nrel_command_template.scs b/sc-models/user-interface/kb/core/ui/ui_nrel_command_template.scs index b4a59d13..9fdd846f 100644 --- a/sc-models/user-interface/kb/core/ui/ui_nrel_command_template.scs +++ b/sc-models/user-interface/kb/core/ui/ui_nrel_command_template.scs @@ -7,4 +7,4 @@ ui_nrel_command_template (* <- lang_en;; *); <- quasybinary_relation; -<- sc_node_norole_relation;; +<- sc_node_non_role_relation;; diff --git a/sc-models/user-interface/kb/core/ui/ui_nrel_user_default_ext_language.scs b/sc-models/user-interface/kb/core/ui/ui_nrel_user_default_ext_language.scs index 178c2cc3..8c58f973 100644 --- a/sc-models/user-interface/kb/core/ui/ui_nrel_user_default_ext_language.scs +++ b/sc-models/user-interface/kb/core/ui/ui_nrel_user_default_ext_language.scs @@ -1 +1 @@ -ui_nrel_user_default_ext_language <- sc_node_norole_relation;; +ui_nrel_user_default_ext_language <- sc_node_non_role_relation;; diff --git a/sc-models/user-interface/kb/core/ui/ui_nrel_user_used_language.scs b/sc-models/user-interface/kb/core/ui/ui_nrel_user_used_language.scs index 801f8e01..57667be5 100644 --- a/sc-models/user-interface/kb/core/ui/ui_nrel_user_used_language.scs +++ b/sc-models/user-interface/kb/core/ui/ui_nrel_user_used_language.scs @@ -1,2 +1,2 @@ -ui_nrel_user_used_language <- sc_node_norole_relation;; +ui_nrel_user_used_language <- sc_node_non_role_relation;; diff --git a/sc-models/user-interface/kb/core/ui/ui_start_sc_element.scs b/sc-models/user-interface/kb/core/ui/ui_start_sc_element.scs index 0c29d704..d2793172 100644 --- a/sc-models/user-interface/kb/core/ui/ui_start_sc_element.scs +++ b/sc-models/user-interface/kb/core/ui/ui_start_sc_element.scs @@ -1,5 +1,5 @@ ui_start_sc_element -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [стартовый sc-элемент] (* <- lang_ru;; *); diff --git a/sc-models/user-interface/kb/extended/faq/html/faq.html b/sc-models/user-interface/kb/extended/faq/html/faq.html index 58d70307..0bac4490 100644 --- a/sc-models/user-interface/kb/extended/faq/html/faq.html +++ b/sc-models/user-interface/kb/extended/faq/html/faq.html @@ -23,7 +23,7 @@ Документация. Пользовательский интерфейс IMS
  • Как задавать вопросы ostis-системе?
    Документация. Пользовательский интерфейс IMS
    -ролик о том, как задавать вопрос
    • +ролик о том, как задавать вопрос
  • Как ostis-система решает задачи?
    Раздел. Унификация семантических моделей решения задач
    Раздел. Предметная область действий и задач
    diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_90th_perc_onto_dep/ui_menu_calc_90th_perc_onto_dep_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_90th_perc_onto_dep/ui_menu_calc_90th_perc_onto_dep_content.scs index f9466c2e..07f987cd 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_90th_perc_onto_dep/ui_menu_calc_90th_perc_onto_dep_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_90th_perc_onto_dep/ui_menu_calc_90th_perc_onto_dep_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_ninetieth_percentile_of_ontology_depths => ui_nrel_ (* _-> ui_arg_1;; *);; - ._action_to_calculate_ninetieth_percentile_of_ontology_depths_instance _<- question;; + ._action_to_calculate_ninetieth_percentile_of_ontology_depths_instance <-_ action;; *];; ui_menu_file_for_calculation_ninetieth_percentile_of_ontology_depths => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_abs_onto_dep/ui_menu_ui_menu_calc_abs_onto_dep_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_abs_onto_dep/ui_menu_ui_menu_calc_abs_onto_dep_content.scs index 9b93ad94..4ead758b 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_abs_onto_dep/ui_menu_ui_menu_calc_abs_onto_dep_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_abs_onto_dep/ui_menu_ui_menu_calc_abs_onto_dep_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_absolute_ontology_depths => ui_nrel_command_templat (* _-> ui_arg_1;; *);; - ._action_to_calculate_absolute_ontology_depths_instance _<- question;; + ._action_to_calculate_absolute_ontology_depths_instance <-_ action;; *];; ui_menu_file_for_calculation_absolute_ontology_depths => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_avg_value_onto_dep/ui_menu_calc_avg_value_onto_dep_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_avg_value_onto_dep/ui_menu_calc_avg_value_onto_dep_content.scs index 669b92e6..93e3438f 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_avg_value_onto_dep/ui_menu_calc_avg_value_onto_dep_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_avg_value_onto_dep/ui_menu_calc_avg_value_onto_dep_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_average_value_of_ontology_depths => ui_nrel_command (* _-> ui_arg_1;; *);; - ._action_to_calculate_average_value_of_ontology_depths_instance _<- question;; + ._action_to_calculate_average_value_of_ontology_depths_instance <-_ action;; *];; ui_menu_file_for_calculation_average_value_of_ontology_depths => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_disp_onto_dep/ui_menu_calc_disp_onto_dep_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_disp_onto_dep/ui_menu_calc_disp_onto_dep_content.scs index 9925b177..190c719b 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_disp_onto_dep/ui_menu_calc_disp_onto_dep_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_disp_onto_dep/ui_menu_calc_disp_onto_dep_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_dispersion_of_ontology_depths => ui_nrel_command_te (* _-> ui_arg_1;; *);; - ._action_to_calculate_dispersion_of_ontology_depths_instance _<- question;; + ._action_to_calculate_dispersion_of_ontology_depths_instance <-_ action;; *];; ui_menu_file_for_calculation_dispersion_of_ontology_depths => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_max_value_onto_dep/ui_menu_calc_max_value_onto_dep_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_max_value_onto_dep/ui_menu_calc_max_value_onto_dep_content.scs index 54496997..9c5bb4d0 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_max_value_onto_dep/ui_menu_calc_max_value_onto_dep_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_max_value_onto_dep/ui_menu_calc_max_value_onto_dep_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_max_value_of_ontology_depths => ui_nrel_command_tem (* _-> ui_arg_1;; *);; - ._action_to_calculate_max_value_of_ontology_depths_instance _<- question;; + ._action_to_calculate_max_value_of_ontology_depths_instance <-_ action;; *];; ui_menu_file_for_calculation_max_value_of_ontology_depths => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_med_onto_dep/ui_menu_calc_med_onto_dep_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_med_onto_dep/ui_menu_calc_med_onto_dep_content.scs index c08a7981..7b1247e5 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_med_onto_dep/ui_menu_calc_med_onto_dep_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_med_onto_dep/ui_menu_calc_med_onto_dep_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_median_of_ontology_depths => ui_nrel_command_templa (* _-> ui_arg_1;; *);; - ._action_to_calculate_median_of_ontology_depths_instance _<- question;; + ._action_to_calculate_median_of_ontology_depths_instance <-_ action;; *];; ui_menu_file_for_calculation_median_of_ontology_depths => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_min_value_onto_dep/ui_menu_calc_min_value_onto_dep_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_min_value_onto_dep/ui_menu_calc_min_value_onto_dep_content.scs index caa05984..7c8193b1 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_min_value_onto_dep/ui_menu_calc_min_value_onto_dep_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_min_value_onto_dep/ui_menu_calc_min_value_onto_dep_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_min_value_of_ontology_depths => ui_nrel_command_tem (* _-> ui_arg_1;; *);; - ._action_to_calculate_min_value_of_ontology_depths_instance _<- question;; + ._action_to_calculate_min_value_of_ontology_depths_instance <-_ action;; *];; ui_menu_file_for_calculation_min_value_of_ontology_depths => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_norm_disp_onto_dep/ui_menu_calc_norm_disp_onto_dep_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_norm_disp_onto_dep/ui_menu_calc_norm_disp_onto_dep_content.scs index 01a8a962..8b832807 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_norm_disp_onto_dep/ui_menu_calc_norm_disp_onto_dep_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Depth_metrics/ui_menu_calc_norm_disp_onto_dep/ui_menu_calc_norm_disp_onto_dep_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_normalized_dispersion_of_ontology_depths => ui_nrel (* _-> ui_arg_1;; *);; - ._action_to_calculate_normalized_dispersion_of_ontology_depths_instance _<- question;; + ._action_to_calculate_normalized_dispersion_of_ontology_depths_instance <-_ action;; *];; ui_menu_file_for_calculation_normalized_dispersion_of_ontology_depths => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_90th_perc_vertex_degrees/ui_menu_calc_90th_perc_v_degr_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_90th_perc_vertex_degrees/ui_menu_calc_90th_perc_v_degr_content.scs index e5ac26cb..1b7b7d7d 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_90th_perc_vertex_degrees/ui_menu_calc_90th_perc_v_degr_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_90th_perc_vertex_degrees/ui_menu_calc_90th_perc_v_degr_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_ninetieth_percentile_vertex_degrees => ui_nrel_comm (* _-> ui_arg_1;; *);; - ._action_to_calculate_ninetieth_percentile_vertex_degrees_instance _<- question;; + ._action_to_calculate_ninetieth_percentile_vertex_degrees_instance <-_ action;; *];; ui_menu_file_for_calculation_ninetieth_percentile_vertex_degrees => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_avg_value_vertex_degrees/ui_menu_calc_avg_val_vert_degr_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_avg_value_vertex_degrees/ui_menu_calc_avg_val_vert_degr_content.scs index 61b18ee2..8871a6ae 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_avg_value_vertex_degrees/ui_menu_calc_avg_val_vert_degr_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_avg_value_vertex_degrees/ui_menu_calc_avg_val_vert_degr_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_average_value_of_vertex_degrees => ui_nrel_command_ (* _-> ui_arg_1;; *);; - ._action_to_calculate_average_value_of_vertex_degrees_instance _<- question;; + ._action_to_calculate_average_value_of_vertex_degrees_instance <-_ action;; *];; ui_menu_file_for_calculation_average_value_of_vertex_degrees => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_disper_vertex_degrees/ui_menu_calc_disp_v_degr_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_disper_vertex_degrees/ui_menu_calc_disp_v_degr_content.scs index f2500d62..b1d99b79 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_disper_vertex_degrees/ui_menu_calc_disp_v_degr_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_disper_vertex_degrees/ui_menu_calc_disp_v_degr_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_dispersion_of_vertex_degrees => ui_nrel_command_tem (* _-> ui_arg_1;; *);; - ._action_to_calculate_dispersion_of_vertex_degrees_instance _<- question;; + ._action_to_calculate_dispersion_of_vertex_degrees_instance <-_ action;; *];; ui_menu_file_for_calculation_dispersion_of_vertex_degrees => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_med_vertex_degrees/ui_menu_calc_med_v_degr_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_med_vertex_degrees/ui_menu_calc_med_v_degr_content.scs index aec6faf8..69e02fd7 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_med_vertex_degrees/ui_menu_calc_med_v_degr_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_med_vertex_degrees/ui_menu_calc_med_v_degr_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_median_of_vertex_degrees => ui_nrel_command_templat (* _-> ui_arg_1;; *);; - ._action_to_calculate_median_of_vertex_degrees_instance _<- question;; + ._action_to_calculate_median_of_vertex_degrees_instance <-_ action;; *];; ui_menu_file_for_calculation_median_of_vertex_degrees => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_norm_numb_vert_norm_degr/ui_menu_calc_norm_n_v_norm_deg_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_norm_numb_vert_norm_degr/ui_menu_calc_norm_n_v_norm_deg_content.scs index 02f529a9..56972d3d 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_norm_numb_vert_norm_degr/ui_menu_calc_norm_n_v_norm_deg_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Ingwe-Miller metrics/ui_menu_calcul_norm_numb_vert_norm_degr/ui_menu_calc_norm_n_v_norm_deg_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_normalized_number_of_vertexes_with_normal_degree => (* _-> ui_arg_1;; *);; - ._action_to_calculate_normalized_number_of_vertexes_with_normal_degree_instance _<- question;; + ._action_to_calculate_normalized_number_of_vertexes_with_normal_degree_instance <-_ action;; *];; ui_menu_file_for_calculation_normalized_number_of_vertexes_with_normal_degree => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_arcs_in_structure/ui_menu_file_for_counting_arcs_in_structure_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_arcs_in_structure/ui_menu_file_for_counting_arcs_in_structure_content.scs index 7f0c00e1..2679e437 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_arcs_in_structure/ui_menu_file_for_counting_arcs_in_structure_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_arcs_in_structure/ui_menu_file_for_counting_arcs_in_structure_content.scs @@ -16,7 +16,7 @@ ui_menu_file_for_counting_arcs_in_structure (* _-> ui_arg_1;; *);; - ._action_to_count_arcs_in_structure_instance _<- question;; + ._action_to_count_arcs_in_structure_instance <-_ action;; *];; ui_menu_file_for_counting_arcs_in_structure diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_arcs_in_structure_with_context/ui_menu_file_for_counting_arcs_in_structure_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_arcs_in_structure_with_context/ui_menu_file_for_counting_arcs_in_structure_with_context_content.scs index 36a129af..46cf8922 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_arcs_in_structure_with_context/ui_menu_file_for_counting_arcs_in_structure_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_arcs_in_structure_with_context/ui_menu_file_for_counting_arcs_in_structure_with_context_content.scs @@ -18,7 +18,7 @@ ui_menu_file_for_counting_arcs_in_structure_with_context _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_to_count_arcs_in_structure_instance _<- question;; + ._action_to_count_arcs_in_structure_instance <-_ action;; *];; ui_menu_file_for_counting_arcs_in_structure_with_context diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_nodes_in_structure/ui_menu_file_for_counting_nodes_in_structure_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_nodes_in_structure/ui_menu_file_for_counting_nodes_in_structure_content.scs index 2412d9c6..66794243 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_nodes_in_structure/ui_menu_file_for_counting_nodes_in_structure_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_nodes_in_structure/ui_menu_file_for_counting_nodes_in_structure_content.scs @@ -16,7 +16,7 @@ ui_menu_file_for_counting_nodes_in_structure (* _-> ui_arg_1;; *);; - ._action_to_count_nodes_in_structure_instance _<- question;; + ._action_to_count_nodes_in_structure_instance <-_ action;; *];; ui_menu_file_for_counting_nodes_in_structure diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_nodes_in_structure_with_context/ui_menu_file_for_counting_nodes_in_structure_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_nodes_in_structure_with_context/ui_menu_file_for_counting_nodes_in_structure_with_context_content.scs index 2c6a8f15..509b9250 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_nodes_in_structure_with_context/ui_menu_file_for_counting_nodes_in_structure_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_nodes_in_structure_with_context/ui_menu_file_for_counting_nodes_in_structure_with_context_content.scs @@ -19,7 +19,7 @@ ui_menu_file_for_counting_nodes_in_structure_with_context _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_to_count_nodes_in_structure_instance _<- question;; + ._action_to_count_nodes_in_structure_instance <-_ action;; *];; ui_menu_file_for_counting_nodes_in_structure_with_context diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_structures_in_structure/ui_menu_file_for_counting_structures_in_structure_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_structures_in_structure/ui_menu_file_for_counting_structures_in_structure_content.scs index 1b670ae0..1892f742 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_structures_in_structure/ui_menu_file_for_counting_structures_in_structure_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_structures_in_structure/ui_menu_file_for_counting_structures_in_structure_content.scs @@ -16,7 +16,7 @@ ui_menu_file_for_counting_structures_in_structure (* _-> ui_arg_1;; *);; - ._action_to_count_structures_in_structure_instance _<- question;; + ._action_to_count_structures_in_structure_instance <-_ action;; *];; ui_menu_file_for_counting_structures_in_structure diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_structures_in_structure_with_context/ui_menu_file_for_counting_structures_in_structure_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_structures_in_structure_with_context/ui_menu_file_for_counting_structures_in_structure_with_context_content.scs index 0bec22ba..3e1d1e76 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_structures_in_structure_with_context/ui_menu_file_for_counting_structures_in_structure_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_structures_in_structure_with_context/ui_menu_file_for_counting_structures_in_structure_with_context_content.scs @@ -19,7 +19,7 @@ ui_menu_file_for_counting_structures_in_structure_with_context _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_to_count_structures_in_structure_instance _<- question;; + ._action_to_count_structures_in_structure_instance <-_ action;; *];; ui_menu_file_for_counting_structures_in_structure_with_context diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_variables_in_structure/ui_menu_file_for_counting_variables_in_structure_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_variables_in_structure/ui_menu_file_for_counting_variables_in_structure_content.scs index cadaa725..4f356657 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_variables_in_structure/ui_menu_file_for_counting_variables_in_structure_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_variables_in_structure/ui_menu_file_for_counting_variables_in_structure_content.scs @@ -16,7 +16,7 @@ ui_menu_file_for_counting_variables_in_structure (* _-> ui_arg_1;; *);; - ._action_to_count_variables_in_structure_instance _<- question;; + ._action_to_count_variables_in_structure_instance <-_ action;; *];; ui_menu_file_for_counting_variables_in_structure diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_variables_in_structure_with_context/ui_menu_file_for_counting_variables_in_structure_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_variables_in_structure_with_context/ui_menu_file_for_counting_variables_in_structure_with_context_content.scs index 14ec3472..6d2c605e 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_variables_in_structure_with_context/ui_menu_file_for_counting_variables_in_structure_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/count_variables_in_structure_with_context/ui_menu_file_for_counting_variables_in_structure_with_context_content.scs @@ -19,7 +19,7 @@ ui_menu_file_for_counting_variables_in_structure_with_context _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_to_count_variables_in_structure_instance _<- question;; + ._action_to_count_variables_in_structure_instance <-_ action;; *];; ui_menu_file_for_counting_variables_in_structure_with_context diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_calc_number_sect/ui_menu_calc_number_sect_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_calc_number_sect/ui_menu_calc_number_sect_content.scs index ae33dfc7..2ad7998d 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_calc_number_sect/ui_menu_calc_number_sect_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_calc_number_sect/ui_menu_calc_number_sect_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_number_of_sections => ui_nrel_command_template: (* _-> section;; *);; - ._action_to_calculate_number_of_sections_instance _<- question;; + ._action_to_calculate_number_of_sections_instance <-_ action;; *];; ui_menu_file_for_calculation_number_of_sections => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_calc_number_subjdomains/ui_menu_calc_number_subjdomains_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_calc_number_subjdomains/ui_menu_calc_number_subjdomains_content.scs index 06d184d4..1739f23f 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_calc_number_subjdomains/ui_menu_calc_number_subjdomains_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_calc_number_subjdomains/ui_menu_calc_number_subjdomains_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_number_of_subject_domains => ui_nrel_command_templa (* _-> subject_domain;; *);; - ._action_to_calculate_number_of_subject_domains_instance _<- question;; + ._action_to_calculate_number_of_subject_domains_instance <-_ action;; *];; ui_menu_file_for_calculation_number_of_subject_domains => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_average_depth_of_subject_domain/ui_menu_file_for_calculation_average_depth_of_subject_domain_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_average_depth_of_subject_domain/ui_menu_file_for_calculation_average_depth_of_subject_domain_content.scs index c27546d3..41404135 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_average_depth_of_subject_domain/ui_menu_file_for_calculation_average_depth_of_subject_domain_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_average_depth_of_subject_domain/ui_menu_file_for_calculation_average_depth_of_subject_domain_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_average_depth_of_subject_domain => ui_nrel_command_ (* _-> ui_arg_1;; *);; - ._action_to_calculate_average_depth_of_subject_domain_instance _<- question;; + ._action_to_calculate_average_depth_of_subject_domain_instance <-_ action;; *];; ui_menu_file_for_calculation_average_depth_of_subject_domain => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_number_of_class_instances/ui_menu_file_for_calculation_number_of_class_instances_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_number_of_class_instances/ui_menu_file_for_calculation_number_of_class_instances_content.scs index 94a48c0d..5b14b324 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_number_of_class_instances/ui_menu_file_for_calculation_number_of_class_instances_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_number_of_class_instances/ui_menu_file_for_calculation_number_of_class_instances_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_number_of_class_instances => ui_nrel_command_templa (* _-> ui_arg_1;; *);; - ._action_to_calculate_number_of_class_instances_instance _<- question;; + ._action_to_calculate_number_of_class_instances_instance <-_ action;; *];; ui_menu_file_for_calculation_number_of_class_instances => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_number_of_concepts_and_relations/ui_menu_file_for_calculation_number_of_concepts_and_relations_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_number_of_concepts_and_relations/ui_menu_file_for_calculation_number_of_concepts_and_relations_content.scs index 39e574c7..82cdd173 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_number_of_concepts_and_relations/ui_menu_file_for_calculation_number_of_concepts_and_relations_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_calculation_number_of_concepts_and_relations/ui_menu_file_for_calculation_number_of_concepts_and_relations_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_number_of_concepts_and_relations => ui_nrel_command (* _-> concept;; *);; - ._action_to_calculate_number_of_concepts_and_relations_instance _<- question;; + ._action_to_calculate_number_of_concepts_and_relations_instance <-_ action;; *];; ui_menu_file_for_calculation_number_of_concepts_and_relations => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_counting_logical_formulas_quantity/ui_menu_file_for_counting_logical_formulas_quantity_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_counting_logical_formulas_quantity/ui_menu_file_for_counting_logical_formulas_quantity_content.scs index 0fece786..e2b6773d 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_counting_logical_formulas_quantity/ui_menu_file_for_counting_logical_formulas_quantity_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Kb_volume_metrics/ui_menu_file_for_counting_logical_formulas_quantity/ui_menu_file_for_counting_logical_formulas_quantity_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_counting_logical_formulas_quantity => ui_nrel_command_template: (* _-> statement;; *);; - ._action_to_count_logical_formulas_quantity_instance _<- question;; + ._action_to_count_logical_formulas_quantity_instance <-_ action;; *];; ui_menu_file_for_counting_logical_formulas_quantity => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/lib_component_ui_menu_file_for_calculation_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes/ui_menu_file_for_calculation_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/lib_component_ui_menu_file_for_calculation_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes/ui_menu_file_for_calculation_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes_content.scs index c3c8437c..71df5111 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/lib_component_ui_menu_file_for_calculation_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes/ui_menu_file_for_calculation_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/lib_component_ui_menu_file_for_calculation_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes/ui_menu_file_for_calculation_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_number_of_diff_input_connections_for_vertex_to_all_ (* _-> ui_arg_1;; *);; - ._action_to_calculate_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes_instance _<- question;; + ._action_to_calculate_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes_instance <-_ action;; *];; ui_menu_file_for_calculation_number_of_diff_input_connections_for_vertex_to_all_ontology_vertexes => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_average_value_of_outbound_connections_vertex_of_ontology/ui_menu_file_for_calculation_average_value_of_outbound_connections_vertex_of_ontology_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_average_value_of_outbound_connections_vertex_of_ontology/ui_menu_file_for_calculation_average_value_of_outbound_connections_vertex_of_ontology_content.scs index 2eb08c4c..ddd71450 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_average_value_of_outbound_connections_vertex_of_ontology/ui_menu_file_for_calculation_average_value_of_outbound_connections_vertex_of_ontology_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_average_value_of_outbound_connections_vertex_of_ontology/ui_menu_file_for_calculation_average_value_of_outbound_connections_vertex_of_ontology_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_average_value_of_outbound_connections_vertex_of_ont (* _-> ui_arg_1;; *);; - ._action_to_calculate_average_value_of_outbound_connections_vertex_of_ontology_instance _<- question;; + ._action_to_calculate_average_value_of_outbound_connections_vertex_of_ontology_instance <-_ action;; *];; ui_menu_file_for_calculation_average_value_of_outbound_connections_vertex_of_ontology => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_number_of_all_types_of_input_connections_of_vertex/ui_menu_file_for_calculation_number_of_all_types_of_input_connections_of_vertex_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_number_of_all_types_of_input_connections_of_vertex/ui_menu_file_for_calculation_number_of_all_types_of_input_connections_of_vertex_content.scs index 22c5cb5a..385d6735 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_number_of_all_types_of_input_connections_of_vertex/ui_menu_file_for_calculation_number_of_all_types_of_input_connections_of_vertex_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_number_of_all_types_of_input_connections_of_vertex/ui_menu_file_for_calculation_number_of_all_types_of_input_connections_of_vertex_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_number_of_all_types_of_input_connections_of_vertex (* _-> ui_arg_1;; *);; - ._action_to_calculate_average_value_of_input_connections_of_vertex_instance _<- question;; + ._action_to_calculate_average_value_of_input_connections_of_vertex_instance <-_ action;; *];; ui_menu_file_for_calculation_number_of_all_types_of_input_connections_of_vertex => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_of_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_vertexes/ui_menu_file_for_calculation_of_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_vertexes_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_of_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_vertexes/ui_menu_file_for_calculation_of_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_vertexes_content.scs index 9640b26c..0ec20f5f 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_of_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_vertexes/ui_menu_file_for_calculation_of_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_vertexes_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/Methods_evaluation/Metrics_of_diff_vertex_connections/ui_menu_file_for_calculation_of_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_vertexes/ui_menu_file_for_calculation_of_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_vertexes_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_calculation_of_the_number_of_vertexes_with_diff_types_of_outgoi (* _-> ui_arg_1;; *);; - ._action_to_calculate_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_the_vertexes_of_the_ontology_instance _<- question;; + ._action_to_calculate_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_the_vertexes_of_the_ontology_instance <-_ action;; *];; ui_menu_file_for_calculation_of_the_number_of_vertexes_with_diff_types_of_outgoing_connections_to_all_vertexes => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_admin_reject_prop_edit_kb/ui_menu_admin_reject_prop_edit_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_admin_reject_prop_edit_kb/ui_menu_admin_reject_prop_edit_kb_content.scs index 9668e950..5ef07da3 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_admin_reject_prop_edit_kb/ui_menu_admin_reject_prop_edit_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_admin_reject_prop_edit_kb/ui_menu_admin_reject_prop_edit_kb_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_administrator_rejection_proposals_for_editing_kb => ui_nrel_com (* _-> ui_arg_1;; *);; - ._action_to_reject_the_proposal_for_editing_the_knowledge_base_administrator_instance _<- question;; + ._action_to_reject_the_proposal_for_editing_the_knowledge_base_administrator_instance <-_ action;; *];; ui_menu_file_for_administrator_rejection_proposals_for_editing_kb => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_appr_prop_edit_kb/ui_menu_admin_appr_prop_edit_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_appr_prop_edit_kb/ui_menu_admin_appr_prop_edit_kb_content.scs index e6956272..d8b0a5aa 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_appr_prop_edit_kb/ui_menu_admin_appr_prop_edit_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_appr_prop_edit_kb/ui_menu_admin_appr_prop_edit_kb_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_administrator_approval_proposals_for_editing_kb => ui_nrel_comm (* _-> ui_arg_1;; *);; - ._action_to_approve_the_proposal_for_editing_the_knowledge_base_administrator_instance _<- question;; + ._action_to_approve_the_proposal_for_editing_the_knowledge_base_administrator_instance <-_ action;; *];; ui_menu_file_for_administrator_approval_proposals_for_editing_kb => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_appr_verif_res_of_offer/ui_approval_verification_result_of_offer_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_appr_verif_res_of_offer/ui_approval_verification_result_of_offer_content.scs index 7550c9cd..b6b5c15e 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_appr_verif_res_of_offer/ui_approval_verification_result_of_offer_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_appr_verif_res_of_offer/ui_approval_verification_result_of_offer_content.scs @@ -9,7 +9,7 @@ ui_approval_verification_result_of_offer => ui_nrel_command_template: (* _-> rrel_1:: ui_arg_1;; *);; - ._action_to_approve_the_result_of_proposal_verification_instance _<- question;; + ._action_to_approve_the_result_of_proposal_verification_instance <-_ action;; *];; ui_approval_verification_result_of_offer => ui_nrel_command_lang_template: [Утвердить результат верификации предложения: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_administrator/ui_menu_agent_of_assign_user_as_administrator_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_administrator/ui_menu_agent_of_assign_user_as_administrator_content.scs index 223553a2..0692cddd 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_administrator/ui_menu_agent_of_assign_user_as_administrator_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_administrator/ui_menu_agent_of_assign_user_as_administrator_content.scs @@ -13,7 +13,7 @@ ui_menu_agent_of_assign_user_as_administrator => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_assign_user_as_administrator_instance _<- question;; + ._action_assign_user_as_administrator_instance <-_ action;; *];; ui_menu_agent_of_assign_user_as_administrator => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_expert/ui_menu_agent_of_assign_user_as_expert_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_expert/ui_menu_agent_of_assign_user_as_expert_content.scs index 275cc5d3..5b82ea3c 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_expert/ui_menu_agent_of_assign_user_as_expert_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_expert/ui_menu_agent_of_assign_user_as_expert_content.scs @@ -13,7 +13,7 @@ ui_menu_agent_of_assign_user_as_expert => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_assign_user_as_expert_instance _<- question;; + ._action_assign_user_as_expert_instance <-_ action;; *];; ui_menu_agent_of_assign_user_as_expert => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_manager/ui_menu_agent_of_assign_user_as_manager_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_manager/ui_menu_agent_of_assign_user_as_manager_content.scs index e9932128..5affc5f2 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_manager/ui_menu_agent_of_assign_user_as_manager_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_for_assign_user_as_manager/ui_menu_agent_of_assign_user_as_manager_content.scs @@ -13,7 +13,7 @@ ui_menu_agent_of_assign_user_as_manager => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_assign_user_as_manager_instance _<- question;; + ._action_assign_user_as_manager_instance <-_ action;; *];; ui_menu_agent_of_assign_user_as_manager => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_of_verify_the_desired_structure/ui_menu_file_for_verify_the_desired_structure_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_of_verify_the_desired_structure/ui_menu_file_for_verify_the_desired_structure_content.scs index 984bcb60..23e2dc16 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_of_verify_the_desired_structure/ui_menu_file_for_verify_the_desired_structure_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_file_of_verify_the_desired_structure/ui_menu_file_for_verify_the_desired_structure_content.scs @@ -14,7 +14,7 @@ ui_menu_file_for_verify_the_desired_structure => ui_nrel_command_template: _-> rrel_1:: ui_arg_1;; _-> rrel_2:: ui_arg_2;; *);; - ._action_to_form_a_task_for_verification_of_the_proposal_instance _<- question;; + ._action_to_form_a_task_for_verification_of_the_proposal_instance <-_ action;; *];; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_reject_verif_res_of_offer/ui_rejection_verification_result_of_offer_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_reject_verif_res_of_offer/ui_rejection_verification_result_of_offer_content.scs index 665defdd..b59f7d09 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_reject_verif_res_of_offer/ui_rejection_verification_result_of_offer_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/admin/ui_menu_reject_verif_res_of_offer/ui_rejection_verification_result_of_offer_content.scs @@ -9,7 +9,7 @@ ui_rejection_verification_result_of_offer => ui_nrel_command_template: (* _-> rrel_1:: ui_arg_1;; *);; - ._action_to_reject_the_result_of_proposal_verification_instance _<- question;; + ._action_to_reject_the_result_of_proposal_verification_instance <-_ action;; *];; ui_rejection_verification_result_of_offer => ui_nrel_command_lang_template: [Отклонить результат верификации предложения: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_author/ui_menu_file_for_finding_all_drafts_of_author_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_author/ui_menu_file_for_finding_all_drafts_of_author_content.scs index 89e1dbeb..ab4936f1 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_author/ui_menu_file_for_finding_all_drafts_of_author_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_author/ui_menu_file_for_finding_all_drafts_of_author_content.scs @@ -15,7 +15,7 @@ ui_menu_file_for_finding_all_drafts_of_author => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_of_finding_all_drafts_of_author_instance _<- question;; + ._action_of_finding_all_drafts_of_author_instance <-_ action;; *];; ui_menu_file_for_finding_all_drafts_of_author => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/htmls/ui_of_finding_all_drafts_of_question_author.html b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/htmls/ui_of_finding_all_drafts_of_question_author.html index 3e843cfd..9546fe0b 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/htmls/ui_of_finding_all_drafts_of_question_author.html +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/htmls/ui_of_finding_all_drafts_of_question_author.html @@ -1,7 +1,7 @@ -

    Команда пользовательского интерфейса для поиска всех черновиков автора вопроса предназначена для поиска всех черновиковпользователя, который является автором вопроса. Результатом выполнения команды является вывод на экран всех черновиков пользователя, который является автором вопроса. +

    Команда пользовательского интерфейса для поиска всех черновиков автора вопроса предназначена для поиска всех черновиковпользователя, который является автором вопроса. Результатом выполнения команды является вывод на экран всех черновиков пользователя, который является автором вопроса.

    Команда поиска всех черновиков автора вопроса diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/lib_ui_menu_file_for_finding_all_drafts_of_question_author.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/lib_ui_menu_file_for_finding_all_drafts_of_question_author.scs index 299cee36..13a66458 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/lib_ui_menu_file_for_finding_all_drafts_of_question_author.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/lib_ui_menu_file_for_finding_all_drafts_of_question_author.scs @@ -1,8 +1,8 @@ -lib_ui_menu_file_for_finding_all_drafts_of_question_author +lib_ui_menu_file_for_finding_all_drafts_of_action_author => nrel_main_idtf: [Компонент библиотеки. Команда пользовательского интерфейса для поиска всех черновиков автора вопроса] (* <- lang_ru;; *); - [Library component. User interface command for search all drafts of question author] + [Library component. User interface command for search all drafts of action author] (* <- lang_en;; *); <- library_of_platform_independent_reusable_components; @@ -17,7 +17,7 @@ lib_ui_menu_file_for_finding_all_drafts_of_question_author ... (* -> rrel_example: - "file://htmls/ui_of_finding_all_drafts_of_question_author.html" + "file://htmls/ui_of_finding_all_drafts_of_action_author.html" (* <- lang_ru;; => nrel_format: format_html;; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/ui_menu_file_for_finding_all_drafts_of_question_author_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/ui_menu_file_for_finding_all_drafts_of_question_author_content.scs index 9f77c62c..d237625e 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/ui_menu_file_for_finding_all_drafts_of_question_author_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_drafts_of_question_author/ui_menu_file_for_finding_all_drafts_of_question_author_content.scs @@ -1,24 +1,24 @@ -lib_ui_menu_file_for_finding_all_drafts_of_question_author = [* -ui_menu_file_for_finding_all_drafts_of_question_author <- ui_user_command_class_atom; ui_user_command_class_view_kb; ui_no_argument_command_class;; +lib_ui_menu_file_for_finding_all_drafts_of_action_author = [* +ui_menu_file_for_finding_all_drafts_of_action_author <- ui_user_command_class_atom; ui_user_command_class_view_kb; ui_no_argument_command_class;; -ui_menu_file_for_finding_all_drafts_of_question_author => nrel_main_idtf: +ui_menu_file_for_finding_all_drafts_of_action_author => nrel_main_idtf: [Показать мои черновики] (* <- lang_ru;; *);; -ui_menu_file_for_finding_all_drafts_of_question_author => nrel_main_idtf: +ui_menu_file_for_finding_all_drafts_of_action_author => nrel_main_idtf: [Show my drafts] (* <- lang_en;; *);; -ui_menu_file_for_finding_all_drafts_of_question_author => ui_nrel_command_template: +ui_menu_file_for_finding_all_drafts_of_action_author => ui_nrel_command_template: [* - action_of_finding_all_drafts_of_question_author _-> ._action_of_finding_all_drafts_of_question_author_instance;; - ._action_of_finding_all_drafts_of_question_author_instance _<- question;; + action_of_finding_all_drafts_of_action_author _-> ._action_of_finding_all_drafts_of_action_author_instance;; + ._action_of_finding_all_drafts_of_action_author_instance <-_ action;; *];; -ui_menu_file_for_finding_all_drafts_of_question_author => ui_nrel_command_lang_template: +ui_menu_file_for_finding_all_drafts_of_action_author => ui_nrel_command_lang_template: [Показать мои черновики] (* <- lang_ru;; *);; -ui_menu_file_for_finding_all_drafts_of_question_author => ui_nrel_command_lang_template: +ui_menu_file_for_finding_all_drafts_of_action_author => ui_nrel_command_lang_template: [Show my drafts] (* <- lang_eng;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_initiated_signs/htmls/ui_menu_file_for_finding_all_initiated_signs.html b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_initiated_signs/htmls/ui_menu_file_for_finding_all_initiated_signs.html index 0d5920c8..0072a083 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_initiated_signs/htmls/ui_menu_file_for_finding_all_initiated_signs.html +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_initiated_signs/htmls/ui_menu_file_for_finding_all_initiated_signs.html @@ -1,7 +1,7 @@  -

    Команда поиска всех инициированных знаков действий предназначена для поиска всех инициированных знаков действий. У данной команды нет аргументов. Результатом выполнения команды является вывод на экран всех инициированных знаков действий, предложений в рамках этих действий, если такие есть, а также авторов данных предложений. +

    Команда поиска всех инициированных знаков действий предназначена для поиска всех инициированных знаков действий. У данной команды нет аргументов. Результатом выполнения команды является вывод на экран всех инициированных знаков действий, предложений в рамках этих действий, если такие есть, а также авторов данных предложений.

    Команда поиска всех инициированных знаков действий diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_initiated_signs/ui_menu_file_for_finding_all_initiated_signs_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_initiated_signs/ui_menu_file_for_finding_all_initiated_signs_content.scs index e393485d..66e9422c 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_initiated_signs/ui_menu_file_for_finding_all_initiated_signs_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_initiated_signs/ui_menu_file_for_finding_all_initiated_signs_content.scs @@ -8,9 +8,9 @@ ui_menu_file_for_finding_all_initiated_signs => ui_nrel_command_template: [* action_of_finding_all_initiated_signs _-> ._action_of_finding_all_initiated_signs_instance (* - _-> question_initiated;; + _-> action_initiated;; *);; - ._action_of_finding_all_initiated_signs_instance _<- question;; + ._action_of_finding_all_initiated_signs_instance <-_ action;; *];; ui_menu_file_for_finding_all_initiated_signs => ui_nrel_command_lang_template: [Найти все инициированные знаки действий.] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_author/ui_menu_file_for_finding_all_proposals_of_author_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_author/ui_menu_file_for_finding_all_proposals_of_author_content.scs index 09cce218..1005b589 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_author/ui_menu_file_for_finding_all_proposals_of_author_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_author/ui_menu_file_for_finding_all_proposals_of_author_content.scs @@ -15,7 +15,7 @@ ui_menu_file_for_finding_all_proposals_of_author => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_of_finding_all_proposals_of_author_instance _<- question;; + ._action_of_finding_all_proposals_of_author_instance <-_ action;; *];; ui_menu_file_for_finding_all_proposals_of_author => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/htmls/ui_of_finding_all_proposals_of_question_author.html b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/htmls/ui_of_finding_all_proposals_of_question_author.html index 5a1e44f7..81495782 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/htmls/ui_of_finding_all_proposals_of_question_author.html +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/htmls/ui_of_finding_all_proposals_of_question_author.html @@ -1,7 +1,7 @@ -

    Команда пользовательского интерфейса для поиска всех предложений автора вопроса предназначена для поиска всех предложенийавтора вопроса. Результатом выполнения команды является вывод на экран всех предложений автора вопроса. +

    Команда пользовательского интерфейса для поиска всех предложений автора вопроса предназначена для поиска всех предложенийавтора вопроса. Результатом выполнения команды является вывод на экран всех предложений автора вопроса.

    Команда поиска всех предложений автора вопроса diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/lib_ui_menu_file_for_finding_all_proposals_by_question_author.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/lib_ui_menu_file_for_finding_all_proposals_by_question_author.scs index cfe32b3d..4f1bd647 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/lib_ui_menu_file_for_finding_all_proposals_by_question_author.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/lib_ui_menu_file_for_finding_all_proposals_by_question_author.scs @@ -1,8 +1,8 @@ -lib_ui_menu_file_for_finding_all_proposals_of_question_author +lib_ui_menu_file_for_finding_all_proposals_of_action_author => nrel_main_idtf: [Компонент библиотеки. Команда пользовательского интерфейса для поиска всех предложений автора вопроса] (* <- lang_ru;; *); - [Library component. User interface command for search all proposals of question author] + [Library component. User interface command for search all proposals of action author] (* <- lang_en;; *); <- library_of_platform_independent_reusable_components; @@ -17,7 +17,7 @@ lib_ui_menu_file_for_finding_all_proposals_of_question_author ... (* -> rrel_example: - "file://htmls/ui_of_finding_all_proposals_of_question_author.html" + "file://htmls/ui_of_finding_all_proposals_of_action_author.html" (* <- lang_ru;; => nrel_format: format_html;; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/ui_menu_file_for_finding_all_proposals_of_question_author_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/ui_menu_file_for_finding_all_proposals_of_question_author_content.scs index 1761b3fb..3d2689da 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/ui_menu_file_for_finding_all_proposals_of_question_author_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_proposals_of_question_author/ui_menu_file_for_finding_all_proposals_of_question_author_content.scs @@ -1,24 +1,24 @@ -lib_ui_menu_file_for_finding_all_proposals_of_question_author = [* -ui_menu_file_for_finding_all_proposals_of_question_author <- ui_user_command_class_atom; ui_user_command_class_view_kb; ui_no_argument_command_class;; +lib_ui_menu_file_for_finding_all_proposals_of_action_author = [* +ui_menu_file_for_finding_all_proposals_of_action_author <- ui_user_command_class_atom; ui_user_command_class_view_kb; ui_no_argument_command_class;; -ui_menu_file_for_finding_all_proposals_of_question_author => nrel_main_idtf: +ui_menu_file_for_finding_all_proposals_of_action_author => nrel_main_idtf: [Показать мои предложения] (* <- lang_ru;; *);; -ui_menu_file_for_finding_all_proposals_of_question_author => nrel_main_idtf: +ui_menu_file_for_finding_all_proposals_of_action_author => nrel_main_idtf: [Show my proposals] (* <- lang_en;; *);; -ui_menu_file_for_finding_all_proposals_of_question_author => ui_nrel_command_template: +ui_menu_file_for_finding_all_proposals_of_action_author => ui_nrel_command_template: [* - action_of_finding_all_proposals_of_question_author _-> ._action_of_finding_all_proposals_of_question_author_instance;; - ._action_of_finding_all_proposals_of_question_author_instance _<- question;; + action_of_finding_all_proposals_of_action_author _-> ._action_of_finding_all_proposals_of_action_author_instance;; + ._action_of_finding_all_proposals_of_action_author_instance <-_ action;; *];; -ui_menu_file_for_finding_all_proposals_of_question_author => ui_nrel_command_lang_template: +ui_menu_file_for_finding_all_proposals_of_action_author => ui_nrel_command_lang_template: [Показать мои предложения] (* <- lang_ru;; *);; -ui_menu_file_for_finding_all_proposals_of_question_author => ui_nrel_command_lang_template: +ui_menu_file_for_finding_all_proposals_of_action_author => ui_nrel_command_lang_template: [Show my proposals] (* <- lang_eng;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_unreviewed_proposals_of_author/ui_menu_file_for_finding_all_unreviewed_proposals_of_author_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_unreviewed_proposals_of_author/ui_menu_file_for_finding_all_unreviewed_proposals_of_author_content.scs index da2e40d5..1ea20fc5 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_unreviewed_proposals_of_author/ui_menu_file_for_finding_all_unreviewed_proposals_of_author_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_all_unreviewed_proposals_of_author/ui_menu_file_for_finding_all_unreviewed_proposals_of_author_content.scs @@ -15,7 +15,7 @@ ui_menu_file_for_finding_all_unreviewed_proposals_of_author => ui_nrel_command_t (* _-> ui_arg_1;; *);; - ._action_of_finding_all_unreviewed_proposals_of_author_instance _<- question;; + ._action_of_finding_all_unreviewed_proposals_of_author_instance <-_ action;; *];; ui_menu_file_for_finding_all_unreviewed_proposals_of_author => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_by_user/ui_menu_file_for_finding_approved_proposals_by_user_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_by_user/ui_menu_file_for_finding_approved_proposals_by_user_content.scs index fc6a93d4..4594ab0f 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_by_user/ui_menu_file_for_finding_approved_proposals_by_user_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_by_user/ui_menu_file_for_finding_approved_proposals_by_user_content.scs @@ -15,7 +15,7 @@ ui_menu_file_for_finding_approved_proposals_by_user => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_of_finding_approved_proposals_by_user_instance _<- question;; + ._action_of_finding_approved_proposals_by_user_instance <-_ action;; *];; ui_menu_file_for_finding_approved_proposals_by_user => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_by_user_with_context/ui_menu_file_for_finding_approved_proposals_by_user_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_by_user_with_context/ui_menu_file_for_finding_approved_proposals_by_user_with_context_content.scs index f555786f..8dc64c1d 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_by_user_with_context/ui_menu_file_for_finding_approved_proposals_by_user_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_by_user_with_context/ui_menu_file_for_finding_approved_proposals_by_user_with_context_content.scs @@ -16,7 +16,7 @@ ui_menu_file_for_finding_approved_proposals_by_user_with_context => ui_nrel_comm _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_of_finding_approved_proposals_by_user_instance _<- question;; + ._action_of_finding_approved_proposals_by_user_instance <-_ action;; *];; ui_menu_file_for_finding_approved_proposals_by_user_with_context => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_of_author/ui_menu_file_for_finding_approved_proposals_of_author_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_of_author/ui_menu_file_for_finding_approved_proposals_of_author_content.scs index 96076e4c..97768472 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_of_author/ui_menu_file_for_finding_approved_proposals_of_author_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_approved_proposals_of_author/ui_menu_file_for_finding_approved_proposals_of_author_content.scs @@ -15,7 +15,7 @@ ui_menu_file_for_finding_approved_proposals_of_author => ui_nrel_command_templat (* _-> ui_arg_1;; *);; - ._action_of_finding_all_approved_proposals_of_author_instance _<- question;; + ._action_of_finding_all_approved_proposals_of_author_instance <-_ action;; *];; ui_menu_file_for_finding_approved_proposals_of_author => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions/htmls/Ui_finding_initiated_signs_of_actions_for_specific_class_of_actions.html b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions/htmls/Ui_finding_initiated_signs_of_actions_for_specific_class_of_actions.html index 02e1fd56..5f9163f0 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions/htmls/Ui_finding_initiated_signs_of_actions_for_specific_class_of_actions.html +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions/htmls/Ui_finding_initiated_signs_of_actions_for_specific_class_of_actions.html @@ -1,7 +1,7 @@  -

    Команда поиска инициированных действий, относящихся к определённому классу действий предназначена для поиска инициированных действий, относящихся к определённому классу действий. Единственным аргументом команды является класс действий, для которого предполагается существование конкретных знаков инициированных действий. Результатом выполнения команды является вывод спецификаций всех инициированных знаков действий, относящихся к определённому классу действий. Пример выполнения команды показан ниже: +

    Команда поиска инициированных действий, относящихся к определённому классу действий предназначена для поиска инициированных действий, относящихся к определённому классу действий. Единственным аргументом команды является класс действий, для которого предполагается существование конкретных знаков инициированных действий. Результатом выполнения команды является вывод спецификаций всех инициированных знаков действий, относящихся к определённому классу действий. Пример выполнения команды показан ниже:

    Команда поиска инициированных знаков действий, относящихся к определённому классу diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions_content.scs index 171643e6..c7fed540 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions/ui_menu_file_for_finding_initiated_signs_of_actions_for_specific_class_of_actions_content.scs @@ -13,7 +13,7 @@ ui_menu_for_agent_of_finding_initiated_signs_of_actions_for_specific_class_of_ac (* _-> ui_arg_1;; *);; - ._action_of_finding_initiated_signs_of_actions_for_specific_class_of_actions_instance _<- question;; + ._action_of_finding_initiated_signs_of_actions_for_specific_class_of_actions_instance <-_ action;; *];; ui_menu_for_agent_of_finding_initiated_signs_of_actions_for_specific_class_of_actions => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_by_user/ui_menu_file_for_finding_rejected_proposals_by_user_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_by_user/ui_menu_file_for_finding_rejected_proposals_by_user_content.scs index 84d20907..a7d44679 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_by_user/ui_menu_file_for_finding_rejected_proposals_by_user_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_by_user/ui_menu_file_for_finding_rejected_proposals_by_user_content.scs @@ -15,7 +15,7 @@ ui_menu_file_for_finding_rejected_proposals_by_user => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_of_finding_rejected_proposals_by_user_instance _<- question;; + ._action_of_finding_rejected_proposals_by_user_instance <-_ action;; *];; ui_menu_file_for_finding_rejected_proposals_by_user => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_by_user_with_context/ui_menu_file_for_finding_rejected_proposals_by_user_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_by_user_with_context/ui_menu_file_for_finding_rejected_proposals_by_user_with_context_content.scs index 0ffdb212..cc838fdf 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_by_user_with_context/ui_menu_file_for_finding_rejected_proposals_by_user_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_by_user_with_context/ui_menu_file_for_finding_rejected_proposals_by_user_with_context_content.scs @@ -18,7 +18,7 @@ ui_menu_file_for_finding_rejected_proposals_by_user_with_context => ui_nrel_comm _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_of_finding_rejected_proposals_by_user_instance _<- question;; + ._action_of_finding_rejected_proposals_by_user_instance <-_ action;; *];; ui_menu_file_for_finding_rejected_proposals_by_user_with_context => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_of_author/ui_menu_file_for_finding_rejected_proposals_of_author_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_of_author/ui_menu_file_for_finding_rejected_proposals_of_author_content.scs index fa4e63a8..f84a203c 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_of_author/ui_menu_file_for_finding_rejected_proposals_of_author_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_file_for_finding_rejected_proposals_of_author/ui_menu_file_for_finding_rejected_proposals_of_author_content.scs @@ -15,7 +15,7 @@ ui_menu_file_for_finding_rejected_proposals_of_author => ui_nrel_command_templat (* _-> ui_arg_1;; *);; - ._action_of_finding_all_rejected_proposals_of_author_instance _<- question;; + ._action_of_finding_all_rejected_proposals_of_author_instance <-_ action;; *];; ui_menu_file_for_finding_rejected_proposals_of_author => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_for_finding_initiated_action_for_a_specific_performer/ui_menu_for_finding_initiated_action_for_a_specific_performer_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_for_finding_initiated_action_for_a_specific_performer/ui_menu_for_finding_initiated_action_for_a_specific_performer_content.scs index 9f588e13..888466e5 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_for_finding_initiated_action_for_a_specific_performer/ui_menu_for_finding_initiated_action_for_a_specific_performer_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/classification_agents/ui_menu_for_finding_initiated_action_for_a_specific_performer/ui_menu_for_finding_initiated_action_for_a_specific_performer_content.scs @@ -13,7 +13,7 @@ ui_menu_for_finding_initiated_action_for_a_specific_performer => ui_nrel_command (* _-> ui_arg_1;; *);; - ._action_of_finding_initiated_action_for_a_specific_performer_instance _<- question;; + ._action_of_finding_initiated_action_for_a_specific_performer_instance <-_ action;; *];; ui_menu_for_agent_of_finding_initiated_action_for_a_specific_performer => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_file_for_formation_suggestion_edit_kb/ui_menu_file_for_formation_suggestion_edit_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_file_for_formation_suggestion_edit_kb/ui_menu_file_for_formation_suggestion_edit_kb_content.scs index 0d80b8c9..d214ed01 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_file_for_formation_suggestion_edit_kb/ui_menu_file_for_formation_suggestion_edit_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_file_for_formation_suggestion_edit_kb/ui_menu_file_for_formation_suggestion_edit_kb_content.scs @@ -10,7 +10,7 @@ ui_menu_file_for_formation_suggestion_edit_kb => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_to_form_a_proposal_for_editing_the_knowledge_base_instance _<- question;; + ._action_to_form_a_proposal_for_editing_the_knowledge_base_instance <-_ action;; *];; ui_menu_file_for_formation_suggestion_edit_kb => ui_nrel_command_lang_template: [Сформировать предложение по редактированию базы знаний: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_file_for_formation_suggestion_edit_kb_to_concrete_section/ui_menu_file_for_formation_suggestion_edit_kb_to_concrete_section_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_file_for_formation_suggestion_edit_kb_to_concrete_section/ui_menu_file_for_formation_suggestion_edit_kb_to_concrete_section_content.scs index f45a8aec..c7cbdc45 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_file_for_formation_suggestion_edit_kb_to_concrete_section/ui_menu_file_for_formation_suggestion_edit_kb_to_concrete_section_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_file_for_formation_suggestion_edit_kb_to_concrete_section/ui_menu_file_for_formation_suggestion_edit_kb_to_concrete_section_content.scs @@ -11,7 +11,7 @@ ui_menu_file_for_formation_suggestion_edit_kb_to_concrete_section => ui_nrel_com _-> rrel_1:: ui_arg_1;; _-> rrel_2:: ui_arg_2;; *);; - ._action_to_form_a_proposal_for_editing_the_knowledge_base_instance _<- question;; + ._action_to_form_a_proposal_for_editing_the_knowledge_base_instance <-_ action;; *];; ui_menu_file_for_formation_suggestion_edit_kb_to_concrete_section => ui_nrel_command_lang_template: [Сформировать предложение ($ui_arg_1) по редактированию конкретного раздела($ui_arg_2) базы знаний] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_form_prop_exec_proj_task/ui_menu_form_prop_exec_proj_task_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_form_prop_exec_proj_task/ui_menu_form_prop_exec_proj_task_content.scs index 00d76ea1..8b0a4c72 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_form_prop_exec_proj_task/ui_menu_form_prop_exec_proj_task_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_form_prop_exec_proj_task/ui_menu_form_prop_exec_proj_task_content.scs @@ -11,7 +11,7 @@ ui_menu_file_for_formation_proposal_executor_of_project_task => ui_nrel_command_ _-> rrel_1:: ui_arg_1;; _-> rrel_2:: ui_arg_2;; *);; - ._action_to_consider_offered_artist_of_project_task_instance _<- question;; + ._action_to_consider_offered_artist_of_project_task_instance <-_ action;; *];; ui_menu_file_for_formation_proposal_executor_of_project_task => ui_nrel_command_lang_template: [Cформировать предложение исполнителя проектного задания: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_form_prop_proj_tasks/ui_menu_file_for_formation_proposed_project_tasks_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_form_prop_proj_tasks/ui_menu_file_for_formation_proposed_project_tasks_content.scs index c33ff355..48aaeea4 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_form_prop_proj_tasks/ui_menu_file_for_formation_proposed_project_tasks_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/developer/ui_menu_form_prop_proj_tasks/ui_menu_file_for_formation_proposed_project_tasks_content.scs @@ -11,7 +11,7 @@ ui_menu_file_for_formation_proposed_project_tasks => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_to_form_a_proposal_of_project_task_instance _<- question;; + ._action_to_form_a_proposal_of_project_task_instance <-_ action;; *];; ui_menu_file_for_formation_proposed_project_tasks => ui_nrel_command_lang_template: [Сформировать предложение проектного задания: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/drafts/ui_menu_file_for_adding_new_draft/ui_menu_file_for_adding_new_draft_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/drafts/ui_menu_file_for_adding_new_draft/ui_menu_file_for_adding_new_draft_content.scs index 3fe2b7e0..01ee6c43 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/drafts/ui_menu_file_for_adding_new_draft/ui_menu_file_for_adding_new_draft_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/drafts/ui_menu_file_for_adding_new_draft/ui_menu_file_for_adding_new_draft_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_adding_new_draft => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_to_add_new_draft_instance _<- question;; + ._action_to_add_new_draft_instance <-_ action;; *];; ui_menu_file_for_adding_new_draft => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/drafts/ui_menu_file_for_finding_drafts_developed_by_specific_developer/ui_menu_file_for_finding_drafts_developed_by_specific_developer_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/drafts/ui_menu_file_for_finding_drafts_developed_by_specific_developer/ui_menu_file_for_finding_drafts_developed_by_specific_developer_content.scs index ec4ee355..d7513bc7 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/drafts/ui_menu_file_for_finding_drafts_developed_by_specific_developer/ui_menu_file_for_finding_drafts_developed_by_specific_developer_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/drafts/ui_menu_file_for_finding_drafts_developed_by_specific_developer/ui_menu_file_for_finding_drafts_developed_by_specific_developer_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_finding_drafts_developed_by_specific_developer => ui_nrel_comma (* _-> ui_arg_1;; *);; - ._action_to_find_drafts_developed_by_specific_developer_instance _<- question;; + ._action_to_find_drafts_developed_by_specific_developer_instance <-_ action;; *];; ui_menu_file_for_finding_drafts_developed_by_specific_developer => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_assign_form_verif_produce/ui_menu_assign_form_verif_prod_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_assign_form_verif_produce/ui_menu_assign_form_verif_prod_content.scs index 74c4b13e..1ac69046 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_assign_form_verif_produce/ui_menu_assign_form_verif_prod_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_assign_form_verif_produce/ui_menu_assign_form_verif_prod_content.scs @@ -15,7 +15,7 @@ ui_menu_file_for_assignment_form_to_the_verification_produce => ui_nrel_command_ _-> rrel_1:: ui_arg_1;; _-> rrel_2:: ui_arg_2;; *);; - ._action_form_task_to_result_of_proposal_verification_instance _<- question;; + ._action_form_task_to_result_of_proposal_verification_instance <-_ action;; *];; ui_menu_file_for_assignment_form_to_the_verification_produce => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_file_for_agent_expert_rejected_of_proposal_for_verified_proposals/ui_menu_file_for_expert_rejection_of_verified_proposal_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_file_for_agent_expert_rejected_of_proposal_for_verified_proposals/ui_menu_file_for_expert_rejection_of_verified_proposal_content.scs index 187627c9..5e7b6b86 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_file_for_agent_expert_rejected_of_proposal_for_verified_proposals/ui_menu_file_for_expert_rejection_of_verified_proposal_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_file_for_agent_expert_rejected_of_proposal_for_verified_proposals/ui_menu_file_for_expert_rejection_of_verified_proposal_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_expert_rejection_of_verified_proposal => ui_nrel_command_templa (* _-> ui_arg_1;; *);; - ._action_of_expert_rejection_of_verified_proposal_instance _<- question;; + ._action_of_expert_rejection_of_verified_proposal_instance <-_ action;; *];; ui_menu_file_for_expert_rejection_of_verified_proposal => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_file_for_agent_of_expert_approval_of_verified_proposal/ui_menu_agent_of_expert_approval_of_verified_proposal_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_file_for_agent_of_expert_approval_of_verified_proposal/ui_menu_agent_of_expert_approval_of_verified_proposal_content.scs index 7a2e676a..3b89ef0a 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_file_for_agent_of_expert_approval_of_verified_proposal/ui_menu_agent_of_expert_approval_of_verified_proposal_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/expert/ui_menu_file_for_agent_of_expert_approval_of_verified_proposal/ui_menu_agent_of_expert_approval_of_verified_proposal_content.scs @@ -13,7 +13,7 @@ ui_menu_agent_of_expert_approval_of_verified_proposal => ui_nrel_command_templat (* _-> ui_arg_1;; *);; - ._action_of_expert_approval_of_verified_proposal_instance _<- question;; + ._action_of_expert_approval_of_verified_proposal_instance <-_ action;; *];; ui_menu_agent_of_expert_approval_of_verified_proposal => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/manager/ui_menu_mng_appr_prop_edit_kb/ui_menu_mng_appr_prop_edit_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/manager/ui_menu_mng_appr_prop_edit_kb/ui_menu_mng_appr_prop_edit_content.scs index a1e76a94..c72c81cf 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/manager/ui_menu_mng_appr_prop_edit_kb/ui_menu_mng_appr_prop_edit_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/manager/ui_menu_mng_appr_prop_edit_kb/ui_menu_mng_appr_prop_edit_content.scs @@ -14,7 +14,7 @@ ui_menu_file_for_manager_approval_proposals_for_editing_kb => ui_nrel_command_te (* _-> ui_arg_1;; *);; - ._action_to_approve_the_proposal_for_editing_the_knowledge_base_manager_instance _<- question;; + ._action_to_approve_the_proposal_for_editing_the_knowledge_base_manager_instance <-_ action;; *];; ui_menu_file_for_manager_approval_proposals_for_editing_kb => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/manager/ui_menu_mng_reject_prop_edit_kb/ui_menu_mngr_reject_prop_edit_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/manager/ui_menu_mng_reject_prop_edit_kb/ui_menu_mngr_reject_prop_edit_kb_content.scs index 2d8199b7..34d6e141 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/manager/ui_menu_mng_reject_prop_edit_kb/ui_menu_mngr_reject_prop_edit_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/activ_auto/manager/ui_menu_mng_reject_prop_edit_kb/ui_menu_mngr_reject_prop_edit_kb_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_manager_rejection_proposals_for_editing_kb => ui_nrel_command_t (* _-> ui_arg_1;; *);; - ._action_to_reject_the_proposal_for_editing_the_knowledge_base_manager_instance _<- question;; + ._action_to_reject_the_proposal_for_editing_the_knowledge_base_manager_instance <-_ action;; *];; ui_menu_file_for_manager_rejection_proposals_for_editing_kb => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/check_translation/ui_menu_check_translation_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/check_translation/ui_menu_check_translation_content.scs index cbfcc521..cce061f8 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/check_translation/ui_menu_check_translation_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/check_translation/ui_menu_check_translation_content.scs @@ -19,8 +19,8 @@ ui_menu_check_translation ui_menu_check_translation => ui_nrel_command_template: [* - question_check_translation _-> ._question_search_all_identifiers_instance;; - ._question_search_all_identifiers_instance _<- question;; + action_check_translation _-> ._action_search_all_identifiers_instance;; + ._action_search_all_identifiers_instance <-_ action;; *];; ui_menu_check_translation => ui_nrel_command_lang_template: [Какие sc-тексты имеют трансляцию только на некоторые внешние языки?] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/commom/eekb_commands_util.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/commom/eekb_commands_util.scs index 1d49f6ff..0ec51685 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/commom/eekb_commands_util.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/commom/eekb_commands_util.scs @@ -17,9 +17,9 @@ nrel_command_access quasybinary_relation -> nrel_command_access;; -sc_node_norole_relation -> nrel_command_access; nrel_command_order;; +sc_node_non_role_relation -> nrel_command_access; nrel_command_order;; -ui_user_command_with_context <- sc_node_not_relation;; +ui_user_command_with_context <- sc_node_class;; ui_user_command_with_context => nrel_main_idtf: [команда с контекстом] diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/lib_ui_menu_my_changes_for_eekb.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/lib_ui_menu_my_changes_for_eekb.scs index b40b5f4e..45c9f44d 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/lib_ui_menu_my_changes_for_eekb.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/lib_ui_menu_my_changes_for_eekb.scs @@ -10,7 +10,7 @@ lib_ui_menu_my_changes_for_eekb <= nrel_library_component_decomposition: { - lib_ui_menu_file_for_finding_all_drafts_of_question_author; - lib_ui_menu_file_for_finding_all_proposals_of_question_author + lib_ui_menu_file_for_finding_all_drafts_of_action_author; + lib_ui_menu_file_for_finding_all_proposals_of_action_author };; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/ui_menu_my_changes_for_eekb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/ui_menu_my_changes_for_eekb_content.scs index ecc145d2..f650b857 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/ui_menu_my_changes_for_eekb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/eekb_commands/my_changes_for_eekb/ui_menu_my_changes_for_eekb_content.scs @@ -4,12 +4,12 @@ ui_menu_my_changes_for_eekb <- ui_user_command_class_noatom; => nrel_main_idtf: [My changes] (* <- lang_en;; *); <= nrel_ui_commands_decomposition: { - ui_menu_file_for_finding_all_drafts_of_question_author + ui_menu_file_for_finding_all_drafts_of_action_author (* => nrel_command_order: - ui_menu_file_for_finding_all_proposals_of_question_author;; + ui_menu_file_for_finding_all_proposals_of_action_author;; *); - ui_menu_file_for_finding_all_proposals_of_question_author + ui_menu_file_for_finding_all_proposals_of_action_author };; ui_menu_my_changes_for_eekb <= nrel_command_access: ... diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/forming_agents/ui_menu_file_for_forming_agreed_kb_part/ui_menu_file_for_forming_agreed_kb_part_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/forming_agents/ui_menu_file_for_forming_agreed_kb_part/ui_menu_file_for_forming_agreed_kb_part_content.scs index 89d82b90..4ed0a374 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/forming_agents/ui_menu_file_for_forming_agreed_kb_part/ui_menu_file_for_forming_agreed_kb_part_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/forming_agents/ui_menu_file_for_forming_agreed_kb_part/ui_menu_file_for_forming_agreed_kb_part_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_forming_agreed_kb_part => ui_nrel_command_template: (* _-> concerted_part_of_kb;; *);; - ._action_of_forming_agreed_knowledge_base_part_instance _<- question;; + ._action_of_forming_agreed_knowledge_base_part_instance <-_ action;; *];; ui_menu_file_for_forming_agreed_kb_part => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_change_arc_direction/ui_menu_file_for_change_arc_direction_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_change_arc_direction/ui_menu_file_for_change_arc_direction_content.scs index 4de9a335..d6739cbc 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_change_arc_direction/ui_menu_file_for_change_arc_direction_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_change_arc_direction/ui_menu_file_for_change_arc_direction_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_change_arc_direction => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_to_change_arc_direction_instance _<- question;; + ._action_to_change_arc_direction_instance <-_ action;; *];; ui_menu_file_for_change_arc_direction => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_changing_main_identifier/ui_menu_file_for_changing_main_identifier_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_changing_main_identifier/ui_menu_file_for_changing_main_identifier_content.scs index 71ca8ea5..0fbbc8ba 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_changing_main_identifier/ui_menu_file_for_changing_main_identifier_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_changing_main_identifier/ui_menu_file_for_changing_main_identifier_content.scs @@ -14,7 +14,7 @@ ui_menu_file_for_changing_main_identifier => ui_nrel_command_template: _-> rrel_1:: ui_arg_1;; _-> rrel_2:: ui_arg_2;; *);; - ._action_to_change_main_identifier_instance _<- question;; + ._action_to_change_main_identifier_instance <-_ action;; *];; ui_menu_file_for_changing_main_identifier => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_changing_system_identifier/ui_menu_file_for_changing_system_identifier_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_changing_system_identifier/ui_menu_file_for_changing_system_identifier_content.scs index b0c047a8..31daffe3 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_changing_system_identifier/ui_menu_file_for_changing_system_identifier_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_changing_system_identifier/ui_menu_file_for_changing_system_identifier_content.scs @@ -14,7 +14,7 @@ ui_menu_file_for_changing_system_identifier => ui_nrel_command_template: _-> rrel_1:: ui_arg_1;; _-> rrel_2:: ui_arg_2;; *);; - ._action_to_change_system_identifier_instance _<- question;; + ._action_to_change_system_identifier_instance <-_ action;; *];; ui_menu_file_for_changing_system_identifier => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_removal_sc_element/ui_menu_file_for_removing_sc_element_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_removal_sc_element/ui_menu_file_for_removing_sc_element_content.scs index 8e8c307c..29d20e00 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_removal_sc_element/ui_menu_file_for_removing_sc_element_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_removal_sc_element/ui_menu_file_for_removing_sc_element_content.scs @@ -10,7 +10,7 @@ ui_menu_file_for_removing_sc_element => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_of_removing_sc_element_instance _<- question;; + ._action_of_removing_sc_element_instance <-_ action;; *];; ui_menu_file_for_removing_sc_element => ui_nrel_command_lang_template: [Удалить sc-елемент: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_removing_elements_of_the_struct/ui_menu_file_for_removing_elements_of_the_struct_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_removing_elements_of_the_struct/ui_menu_file_for_removing_elements_of_the_struct_content.scs index 513ad2f0..8746a7bd 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_removing_elements_of_the_struct/ui_menu_file_for_removing_elements_of_the_struct_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/kb_editing/ui_menu_file_for_removing_elements_of_the_struct/ui_menu_file_for_removing_elements_of_the_struct_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_removing_elements_of_the_struct => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_to_removing_elements_of_the_struct_instance _<- question;; + ._action_to_removing_elements_of_the_struct_instance <-_ action;; *];; ui_menu_file_for_removing_elements_of_the_struct => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/na_activity_automatisation/classification_agents/lib_ui_menu_na_kb_classification_agents.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/na_activity_automatisation/classification_agents/lib_ui_menu_na_kb_classification_agents.scs index b59b25e3..6c983982 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/na_activity_automatisation/classification_agents/lib_ui_menu_na_kb_classification_agents.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/na_activity_automatisation/classification_agents/lib_ui_menu_na_kb_classification_agents.scs @@ -12,9 +12,9 @@ lib_ui_menu_na_kb_classification_agents { lib_component_ui_menu_file_for_finding_all_initiated_signs; lib_ui_menu_file_for_finding_all_drafts_of_author; - lib_ui_menu_file_for_finding_all_drafts_of_question_author; + lib_ui_menu_file_for_finding_all_drafts_of_action_author; lib_ui_menu_file_for_finding_all_proposals_of_author; - lib_ui_menu_file_for_finding_all_proposals_of_question_author; + lib_ui_menu_file_for_finding_all_proposals_of_action_author; lib_ui_menu_file_for_finding_all_unreviewed_proposals_of_author; lib_ui_menu_file_for_finding_approved_proposals_by_user; lib_ui_menu_file_for_finding_approved_proposals_of_author; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/na_activity_automatisation/classification_agents/ui_menu_na_kb_classification_agents_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/na_activity_automatisation/classification_agents/ui_menu_na_kb_classification_agents_content.scs index e707f64e..bf827a2d 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/na_activity_automatisation/classification_agents/ui_menu_na_kb_classification_agents_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/na_activity_automatisation/classification_agents/ui_menu_na_kb_classification_agents_content.scs @@ -6,9 +6,9 @@ ui_menu_na_kb_classification_agents <- ui_user_command_class_noatom; { ui_menu_file_for_finding_all_initiated_signs; ui_menu_file_for_finding_all_drafts_of_author; - ui_menu_file_for_finding_all_drafts_of_question_author; + ui_menu_file_for_finding_all_drafts_of_action_author; ui_menu_file_for_finding_all_proposals_of_author; - ui_menu_file_for_finding_all_proposals_of_question_author; + ui_menu_file_for_finding_all_proposals_of_action_author; ui_menu_file_for_finding_all_unreviewed_proposals_of_author; ui_menu_file_for_finding_approved_proposals_by_user; ui_menu_file_for_finding_approved_proposals_of_author; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_logical_ontology/ui_menu_file_for_forming_logical_ontology_for_the_given_domain_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_logical_ontology/ui_menu_file_for_forming_logical_ontology_for_the_given_domain_content.scs index 04162823..35822565 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_logical_ontology/ui_menu_file_for_forming_logical_ontology_for_the_given_domain_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_logical_ontology/ui_menu_file_for_forming_logical_ontology_for_the_given_domain_content.scs @@ -15,7 +15,7 @@ ui_menu_file_for_forming_logical_ontology_for_the_given_domain => ui_nrel_comman (* _-> ui_arg_1;; *);; - ._action_of_forming_logical_ontology_for_the_given_domain_instance _<- question;; + ._action_of_forming_logical_ontology_for_the_given_domain_instance <-_ action;; *];; ui_menu_file_for_forming_logical_ontology_for_the_given_domain => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_set_theoretic_ontology/ui_menu_file_of_forming_set_theoretic_ontology_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_set_theoretic_ontology/ui_menu_file_of_forming_set_theoretic_ontology_content.scs index 74d29e69..229c5f17 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_set_theoretic_ontology/ui_menu_file_of_forming_set_theoretic_ontology_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_set_theoretic_ontology/ui_menu_file_of_forming_set_theoretic_ontology_content.scs @@ -17,7 +17,7 @@ ui_menu_file_of_forming_set_theoretic_ontology => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_of_forming_set_theoretic_ontology_instance _<- question;; + ._action_of_forming_set_theoretic_ontology_instance <-_ action;; *];; ui_menu_file_of_forming_set_theoretic_ontology => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_terminological_ontology/ui_menu_file_for_forming_terminological_ontology_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_terminological_ontology/ui_menu_file_for_forming_terminological_ontology_content.scs index d4a6a3e9..5b9d540c 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_terminological_ontology/ui_menu_file_for_forming_terminological_ontology_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ontology_forming/ui_menu_file_for_forming_terminological_ontology/ui_menu_file_for_forming_terminological_ontology_content.scs @@ -10,7 +10,7 @@ ui_menu_file_for_forming_terminological_ontology => ui_nrel_command_template: (* _-> rrel_1:: ui_arg_1;; *);; - ._action_of_forming_terminological_ontology_instance _<- question;; + ._action_of_forming_terminological_ontology_instance <-_ action;; *];; ui_menu_file_for_forming_terminological_ontology => ui_nrel_command_lang_template: [Запрос терминологической онтологии для $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_definitions_with_context/ui_menu_file_for_finding_definitions_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_definitions_with_context/ui_menu_file_for_finding_definitions_with_context_content.scs index 2692eb7d..277cae59 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_definitions_with_context/ui_menu_file_for_finding_definitions_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_definitions_with_context/ui_menu_file_for_finding_definitions_with_context_content.scs @@ -13,12 +13,12 @@ ui_menu_file_for_finding_definitions_with_context ui_menu_file_for_finding_definitions_with_context => ui_nrel_command_template: [* - question_of_finding_definitions _-> ._question_of_finding_definitions_instance + action_of_finding_definitions _-> ._action_of_finding_definitions_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._question_of_finding_definitions_instance _<- question;; + ._action_of_finding_definitions_instance <-_ action;; *];; ui_menu_file_for_finding_definitions_with_context => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_examples_with_context/ui_menu_file_for_finding_examples_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_examples_with_context/ui_menu_file_for_finding_examples_with_context_content.scs index 0c2e64ec..b4d5ebd1 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_examples_with_context/ui_menu_file_for_finding_examples_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_examples_with_context/ui_menu_file_for_finding_examples_with_context_content.scs @@ -19,12 +19,12 @@ ui_menu_file_for_finding_examples_with_context ui_menu_file_for_finding_examples_with_context => ui_nrel_command_template: [* - question_of_finding_examples _-> ._question_of_finding_examples_instance + action_of_finding_examples _-> ._action_of_finding_examples_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._question_of_finding_examples_instance _<- question;; + ._action_of_finding_examples_instance <-_ action;; *];; ui_menu_file_for_finding_examples_with_context => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_key_concepts_with_context/ui_menu_file_for_finding_key_concepts_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_key_concepts_with_context/ui_menu_file_for_finding_key_concepts_with_context_content.scs index 7915dc83..af32acf8 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_key_concepts_with_context/ui_menu_file_for_finding_key_concepts_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_key_concepts_with_context/ui_menu_file_for_finding_key_concepts_with_context_content.scs @@ -19,12 +19,12 @@ ui_menu_file_for_finding_key_concepts_with_context ui_menu_file_for_finding_key_concepts_with_context => ui_nrel_command_template: [* - question_finding_key_concepts _-> ._question_finding_key_concepts_instance + action_finding_key_concepts _-> ._action_finding_key_concepts_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._question_finding_key_concepts_instance _<- question;; + ._action_finding_key_concepts_instance <-_ action;; *];; ui_menu_file_for_finding_key_concepts_with_context => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_pattern_with_context/ui_menu_file_for_finding_pattern_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_pattern_with_context/ui_menu_file_for_finding_pattern_with_context_content.scs index 07043528..b93af4e5 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_pattern_with_context/ui_menu_file_for_finding_pattern_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_pattern_with_context/ui_menu_file_for_finding_pattern_with_context_content.scs @@ -19,12 +19,12 @@ ui_menu_file_for_finding_pattern_with_context ui_menu_file_for_finding_pattern_with_context => ui_nrel_command_template: [* - action_search_structure_which_is_isomorphic_to_given_pattern _-> ._question_of_finding_pattern_instance + action_search_structure_which_is_isomorphic_to_given_pattern _-> ._action_of_finding_pattern_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._question_of_finding_pattern_instance _<- question;; + ._action_of_finding_pattern_instance <-_ action;; *];; ui_menu_file_for_finding_pattern_with_context => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_theorems_with_context/ui_menu_file_for_finding_theorems_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_theorems_with_context/ui_menu_file_for_finding_theorems_with_context_content.scs index 4d44e1a3..b799022e 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_theorems_with_context/ui_menu_file_for_finding_theorems_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/with_context/find_theorems_with_context/ui_menu_file_for_finding_theorems_with_context_content.scs @@ -19,12 +19,12 @@ ui_menu_file_for_finding_theorems_with_context ui_menu_file_for_finding_theorems_with_context => ui_nrel_command_template: [* - question_finding_theorems _-> ._question_finding_theorems_instance + action_finding_theorems _-> ._action_finding_theorems_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._question_finding_theorems_instance _<- question;; + ._action_finding_theorems_instance <-_ action;; *];; ui_menu_file_for_finding_theorems_with_context => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/erase_elements/ui_menu_erase_elements.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/erase_elements/ui_menu_erase_elements.scs index e4983971..66f61ebb 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/erase_elements/ui_menu_erase_elements.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/erase_elements/ui_menu_erase_elements.scs @@ -13,11 +13,11 @@ ui_menu_erase_elements ui_menu_erase_elements => ui_nrel_command_template: [* - question_erase_elements _-> ._question_erase_elements + action_erase_elements _-> ._action_erase_elements (* _-> rrel_1:: ui_arg_1;; *);; - ._question_erase_elements _<- question;; + ._action_erase_elements <-_ action;; *];; ui_menu_erase_elements => ui_nrel_command_lang_template: [Удалить sc-элементы] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_identifiers/ui_menu_view_all_identifiers_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_identifiers/ui_menu_view_all_identifiers_content.scs index d277586e..b1ec2e26 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_identifiers/ui_menu_view_all_identifiers_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_identifiers/ui_menu_view_all_identifiers_content.scs @@ -19,11 +19,11 @@ ui_menu_view_all_identifiers ui_menu_view_all_identifiers => ui_nrel_command_template: [* - question_search_all_identifiers _-> ._question_search_all_identifiers_instance + action_search_all_identifiers _-> ._action_search_all_identifiers_instance (* _-> ui_arg_1;; *);; - ._question_search_all_identifiers_instance _<- question;; + ._action_search_all_identifiers_instance <-_ action;; *];; ui_menu_view_all_identifiers => ui_nrel_command_lang_template: [Какие внешние идентификаторы соответствуют $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_input_const_pos_arc/ui_menu_view_all_input_const_pos_arc_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_input_const_pos_arc/ui_menu_view_all_input_const_pos_arc_content.scs index ae51f191..e99a1a13 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_input_const_pos_arc/ui_menu_view_all_input_const_pos_arc_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_input_const_pos_arc/ui_menu_view_all_input_const_pos_arc_content.scs @@ -19,11 +19,11 @@ ui_menu_view_all_input_const_pos_arc ui_menu_view_all_input_const_pos_arc => ui_nrel_command_template: [* - question_search_all_input_const_pos_arcs _-> ._question_search_all_input_const_pos_arcs_instance + action_search_all_input_const_pos_arcs _-> ._action_search_all_input_const_pos_arcs_instance (* _-> ui_arg_1;; *);; - ._question_search_all_input_const_pos_arcs_instance _<- question;; + ._action_search_all_input_const_pos_arcs_instance <-_ action;; *];; ui_menu_view_all_input_const_pos_arc => ui_nrel_command_lang_template: [Элементом каких множеств является $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_input_const_pos_arc_with_rel/ui_menu_view_all_input_const_pos_arc_with_rel_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_input_const_pos_arc_with_rel/ui_menu_view_all_input_const_pos_arc_with_rel_content.scs index 441f3bd1..2b713b5b 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_input_const_pos_arc_with_rel/ui_menu_view_all_input_const_pos_arc_with_rel_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_input_const_pos_arc_with_rel/ui_menu_view_all_input_const_pos_arc_with_rel_content.scs @@ -19,11 +19,11 @@ ui_menu_view_all_input_const_pos_arc_with_rel ui_menu_view_all_input_const_pos_arc_with_rel => ui_nrel_command_template: [* - question_search_all_input_const_pos_arcs_with_rel _-> ._question_search_all_input_const_pos_arcs_with_rel_instance + action_search_all_input_const_pos_arcs_with_rel _-> ._action_search_all_input_const_pos_arcs_with_rel_instance (* _-> ui_arg_1;; *);; - ._question_search_all_input_const_pos_arcs_with_rel_instance _<- question;; + ._action_search_all_input_const_pos_arcs_with_rel_instance <-_ action;; *];; ui_menu_view_all_input_const_pos_arc_with_rel => ui_nrel_command_lang_template: [Элементом каких множеств является $ui_arg_1 и какие роли она там выполняет] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_output_const_pos_arc/ui_menu_view_all_output_const_pos_arc_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_output_const_pos_arc/ui_menu_view_all_output_const_pos_arc_content.scs index 460c81e4..654e6363 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_output_const_pos_arc/ui_menu_view_all_output_const_pos_arc_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_output_const_pos_arc/ui_menu_view_all_output_const_pos_arc_content.scs @@ -19,11 +19,11 @@ ui_menu_view_all_output_const_pos_arc ui_menu_view_all_output_const_pos_arc => ui_nrel_command_template: [* - question_search_all_output_const_pos_arcs _-> ._question_search_all_output_const_pos_arcs_instance + action_search_all_output_const_pos_arcs _-> ._action_search_all_output_const_pos_arcs_instance (* _-> ui_arg_1;; *);; - ._question_search_all_output_const_pos_arcs_instance _<- question;; + ._action_search_all_output_const_pos_arcs_instance <-_ action;; *];; ui_menu_view_all_output_const_pos_arc => ui_nrel_command_lang_template: [Какие элементы принадлежат множеству $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_output_const_pos_arc_with_rel/ui_menu_view_all_output_const_pos_arc_with_rel_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_output_const_pos_arc_with_rel/ui_menu_view_all_output_const_pos_arc_with_rel_content.scs index e8417081..f19ab299 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_output_const_pos_arc_with_rel/ui_menu_view_all_output_const_pos_arc_with_rel_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_output_const_pos_arc_with_rel/ui_menu_view_all_output_const_pos_arc_with_rel_content.scs @@ -19,11 +19,11 @@ ui_menu_view_all_output_const_pos_arc_with_rel ui_menu_view_all_output_const_pos_arc_with_rel => ui_nrel_command_template: [* - question_search_all_output_const_pos_arcs_with_rel _-> ._question_search_all_output_const_pos_arcs_with_rel_instance + action_search_all_output_const_pos_arcs_with_rel _-> ._action_search_all_output_const_pos_arcs_with_rel_instance (* _-> ui_arg_1;; *);; - ._question_search_all_output_const_pos_arcs_with_rel_instance _<- question;; + ._action_search_all_output_const_pos_arcs_with_rel_instance <-_ action;; *];; ui_menu_view_all_output_const_pos_arc_with_rel => ui_nrel_command_lang_template: [Какие элементы принадлежат множеству $ui_arg_1 и какие роли они выполняют] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_subclasses_in_quasybinary_relation/ui_menu_view_all_subclasses_in_quasybinary_relation_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_subclasses_in_quasybinary_relation/ui_menu_view_all_subclasses_in_quasybinary_relation_content.scs index 9cd61bf2..3364fa62 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_subclasses_in_quasybinary_relation/ui_menu_view_all_subclasses_in_quasybinary_relation_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_subclasses_in_quasybinary_relation/ui_menu_view_all_subclasses_in_quasybinary_relation_content.scs @@ -19,11 +19,11 @@ ui_menu_view_all_subclasses_in_quasybinary_relation ui_menu_view_all_subclasses_in_quasybinary_relation => ui_nrel_command_template: [* - question_search_all_subclasses_in_quasybinary_relation _-> ._question_search_all_subclasses_in_quasybinary_relation_instance + action_search_all_subclasses_in_quasybinary_relation _-> ._action_search_all_subclasses_in_quasybinary_relation_instance (* _-> ui_arg_1;; *);; - ._question_search_all_subclasses_in_quasybinary_relation_instance _<- question;; + ._action_search_all_subclasses_in_quasybinary_relation_instance <-_ action;; *];; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_superclasses_in_quasybinary_relation/ui_menu_view_all_superclasses_in_quasybinary_relation_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_superclasses_in_quasybinary_relation/ui_menu_view_all_superclasses_in_quasybinary_relation_content.scs index f3c1afe0..172b1529 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_superclasses_in_quasybinary_relation/ui_menu_view_all_superclasses_in_quasybinary_relation_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_all_superclasses_in_quasybinary_relation/ui_menu_view_all_superclasses_in_quasybinary_relation_content.scs @@ -19,11 +19,11 @@ ui_menu_view_all_superclasses_in_quasybinary_relation ui_menu_view_all_superclasses_in_quasybinary_relation => ui_nrel_command_template: [* - question_search_all_superclasses_in_quasybinary_relation _-> ._question_search_all_superclasses_in_quasybinary_relation_instance + action_search_all_superclasses_in_quasybinary_relation _-> ._action_search_all_superclasses_in_quasybinary_relation_instance (* _-> ui_arg_1;; *);; - ._question_search_all_superclasses_in_quasybinary_relation_instance _<- question;; + ._action_search_all_superclasses_in_quasybinary_relation_instance <-_ action;; *];; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_annotation/ui_menu_file_for_finding_annotation_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_annotation/ui_menu_file_for_finding_annotation_content.scs index 4bce05cb..1670d22f 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_annotation/ui_menu_file_for_finding_annotation_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_annotation/ui_menu_file_for_finding_annotation_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_annotation ui_menu_file_for_finding_annotation => ui_nrel_command_template: [* - question_finding_annotation _-> ._question_finding_annotation_instance + action_finding_annotation _-> ._action_finding_annotation_instance (* _-> ui_arg_1;; *);; - ._question_finding_annotation_instance _<- question;; + ._action_finding_annotation_instance <-_ action;; *];; ui_menu_file_for_finding_annotation => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_authors/ui_menu_view_authors_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_authors/ui_menu_view_authors_content.scs index ffb9b04c..6aaba97f 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_authors/ui_menu_view_authors_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_authors/ui_menu_view_authors_content.scs @@ -19,12 +19,12 @@ ui_menu_view_authors ui_menu_view_authors => ui_nrel_command_template: [* - question_search_links_of_relation_connected_with_element _-> ._question_search_links_of_relation_connected_with_element_instance + action_search_links_of_relation_connected_with_element _-> ._action_search_links_of_relation_connected_with_element_instance (* _-> rrel_1:: ui_arg_1;; _-> rrel_2:: nrel_authors;; *);; - ._question_search_links_of_relation_connected_with_element_instance _<- question;; + ._action_search_links_of_relation_connected_with_element_instance <-_ action;; *];; ui_menu_view_authors => ui_nrel_command_lang_template: [Кто является автором $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_axioms/ui_menu_file_for_finding_axioms_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_axioms/ui_menu_file_for_finding_axioms_content.scs index e9afa93b..eb780397 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_axioms/ui_menu_file_for_finding_axioms_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_axioms/ui_menu_file_for_finding_axioms_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_axioms ui_menu_file_for_finding_axioms => ui_nrel_command_template: [* - question_finding_axioms _-> ._question_finding_axioms_instance + action_finding_axioms _-> ._action_finding_axioms_instance (* _-> ui_arg_1;; *);; - ._question_finding_axioms_instance _<- question;; + ._action_finding_axioms_instance <-_ action;; *];; ui_menu_file_for_finding_axioms => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_connections/ui_menu_file_for_finding_connections_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_connections/ui_menu_file_for_finding_connections_content.scs index f062e585..8c065f10 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_connections/ui_menu_file_for_finding_connections_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_connections/ui_menu_file_for_finding_connections_content.scs @@ -19,12 +19,12 @@ ui_menu_file_for_finding_connections ui_menu_file_for_finding_connections => ui_nrel_command_template: [* - question_finding_connections _-> ._question_finding_connections_instance + action_finding_connections _-> ._action_finding_connections_instance (* _-> rrel_1:: ui_arg_1;; _-> rrel_2:: ui_arg_2;; *);; - ._question_finding_connections_instance _<- question;; + ._action_finding_connections_instance <-_ action;; *];; ui_menu_file_for_finding_connections => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_constants/ui_menu_file_for_finding_constants_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_constants/ui_menu_file_for_finding_constants_content.scs index b193f254..755552eb 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_constants/ui_menu_file_for_finding_constants_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_constants/ui_menu_file_for_finding_constants_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_constants ui_menu_file_for_finding_constants => ui_nrel_command_template: [* - question_of_finding_constants _-> ._question_of_finding_constants_instance + action_of_finding_constants _-> ._action_of_finding_constants_instance (* _-> ui_arg_1;; *);; - ._question_of_finding_constants_instance _<- question;; + ._action_of_finding_constants_instance <-_ action;; *];; ui_menu_file_for_finding_constants => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_decomposition/ui_menu_view_decomposition_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_decomposition/ui_menu_view_decomposition_content.scs index 7131b3f4..bffe0de4 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_decomposition/ui_menu_view_decomposition_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_decomposition/ui_menu_view_decomposition_content.scs @@ -19,11 +19,11 @@ ui_menu_view_decomposition ui_menu_view_decomposition => ui_nrel_command_template: [* - question_search_decomposition _-> ._question_search_decomposition_instance + action_search_decomposition _-> ._action_search_decomposition_instance (* _-> ui_arg_1;; *);; - ._question_search_decomposition_instance _<- question;; + ._action_search_decomposition_instance <-_ action;; *];; ui_menu_view_decomposition => ui_nrel_command_lang_template: [Какие варианты декомпозиции соответствуют $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_definitional_domain/ui_menu_file_for_finding_definitional_domain_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_definitional_domain/ui_menu_file_for_finding_definitional_domain_content.scs index bdf3c8a7..8b300465 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_definitional_domain/ui_menu_file_for_finding_definitional_domain_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_definitional_domain/ui_menu_file_for_finding_definitional_domain_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_definitional_domain ui_menu_file_for_finding_definitional_domain => ui_nrel_command_template: [* - question_of_finding_definitional_domain _-> ._question_of_finding_definitional_domain_instance + action_of_finding_definitional_domain _-> ._action_of_finding_definitional_domain_instance (* _-> ui_arg_1;; *);; - ._question_of_finding_definitional_domain_instance _<- question;; + ._action_of_finding_definitional_domain_instance <-_ action;; *];; ui_menu_file_for_finding_definitional_domain => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_definitions/ui_menu_file_for_finding_definitions_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_definitions/ui_menu_file_for_finding_definitions_content.scs index ff371380..262cf279 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_definitions/ui_menu_file_for_finding_definitions_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_definitions/ui_menu_file_for_finding_definitions_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_definitions ui_menu_file_for_finding_definitions => ui_nrel_command_template: [* - question_of_finding_definitions _-> ._question_of_finding_definitions_instance + action_of_finding_definitions _-> ._action_of_finding_definitions_instance (* _-> ui_arg_1;; *);; - ._question_of_finding_definitions_instance _<- question;question111;; + ._action_of_finding_definitions_instance <-_ action;action111;; *];; ui_menu_file_for_finding_definitions => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_examples/ui_menu_file_for_finding_examples_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_examples/ui_menu_file_for_finding_examples_content.scs index b268315f..b16c43e2 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_examples/ui_menu_file_for_finding_examples_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_examples/ui_menu_file_for_finding_examples_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_examples ui_menu_file_for_finding_examples => ui_nrel_command_template: [* - question_of_finding_examples _-> ._question_of_finding_examples_instance + action_of_finding_examples _-> ._action_of_finding_examples_instance (* _-> ui_arg_1;; *);; - ._question_of_finding_examples_instance _<- question;; + ._action_of_finding_examples_instance <-_ action;; *];; ui_menu_file_for_finding_examples => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_formal_statement/ui_menu_file_for_finding_formal_statement_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_formal_statement/ui_menu_file_for_finding_formal_statement_content.scs index 027ed3a5..2a04c444 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_formal_statement/ui_menu_file_for_finding_formal_statement_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_formal_statement/ui_menu_file_for_finding_formal_statement_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_formal_statement ui_menu_file_for_finding_formal_statement => ui_nrel_command_template: [* - question_finding_formal_statement _-> ._question_finding_formal_statement_instance + action_finding_formal_statement _-> ._action_finding_formal_statement_instance (* _-> ui_arg_1;; *);; - ._question_finding_formal_statement_instance _<- question;; + ._action_finding_formal_statement_instance <-_ action;; *];; ui_menu_file_for_finding_formal_statement => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_illustrations/ui_menu_file_for_finding_illustrations_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_illustrations/ui_menu_file_for_finding_illustrations_content.scs index 74c54c0c..dddbac20 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_illustrations/ui_menu_file_for_finding_illustrations_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_illustrations/ui_menu_file_for_finding_illustrations_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_illustrations ui_menu_file_for_finding_illustrations => ui_nrel_command_template: [* - question_of_finding_illustrations _-> ._question_of_finding_illustrations_instance + action_of_finding_illustrations _-> ._action_of_finding_illustrations_instance (* _-> ui_arg_1;; *);; - ._question_of_finding_illustrations_instance _<- question;; + ._action_of_finding_illustrations_instance <-_ action;; *];; ui_menu_file_for_finding_illustrations => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_key_concepts/ui_menu_file_for_finding_key_concepts_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_key_concepts/ui_menu_file_for_finding_key_concepts_content.scs index 7edea42a..a322c55c 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_key_concepts/ui_menu_file_for_finding_key_concepts_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_key_concepts/ui_menu_file_for_finding_key_concepts_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_key_concepts ui_menu_file_for_finding_key_concepts => ui_nrel_command_template: [* - question_finding_key_concepts _-> ._question_finding_key_concepts_instance + action_finding_key_concepts _-> ._action_finding_key_concepts_instance (* _-> ui_arg_1;; *);; - ._question_finding_key_concepts_instance _<- question;; + ._action_finding_key_concepts_instance <-_ action;; *];; ui_menu_file_for_finding_key_concepts => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_links_of_relation_connected_with_element/ui_menu_view_links_of_relation_connected_with_element_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_links_of_relation_connected_with_element/ui_menu_view_links_of_relation_connected_with_element_content.scs index ab0d78df..bf57d7e0 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_links_of_relation_connected_with_element/ui_menu_view_links_of_relation_connected_with_element_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_links_of_relation_connected_with_element/ui_menu_view_links_of_relation_connected_with_element_content.scs @@ -19,12 +19,12 @@ ui_menu_view_links_of_relation_connected_with_element ui_menu_view_links_of_relation_connected_with_element => ui_nrel_command_template: [* - question_search_links_of_relation_connected_with_element _-> ._question_search_links_of_relation_connected_with_element_instance + action_search_links_of_relation_connected_with_element _-> ._action_search_links_of_relation_connected_with_element_instance (* _-> rrel_1:: ui_arg_1;; _-> rrel_2:: ui_arg_2;; *);; - ._question_search_links_of_relation_connected_with_element_instance _<- question;; + ._action_search_links_of_relation_connected_with_element_instance <-_ action;; *];; ui_menu_view_links_of_relation_connected_with_element => ui_nrel_command_lang_template: [С какими элементами сущность $ui_arg_1 связана отношением $ui_arg_2] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_main_concept/ui_menu_file_for_finding_main_concept_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_main_concept/ui_menu_file_for_finding_main_concept_content.scs index 0f21efe4..94624501 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_main_concept/ui_menu_file_for_finding_main_concept_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_main_concept/ui_menu_file_for_finding_main_concept_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_main_concept ui_menu_file_for_finding_main_concept => ui_nrel_command_template: [* - question_of_finding_main_concept _-> ._question_of_finding_main_concept_instance + action_of_finding_main_concept _-> ._action_of_finding_main_concept_instance (* _-> ui_arg_1;; *);; - ._question_of_finding_main_concept_instance _<- question;; + ._action_of_finding_main_concept_instance <-_ action;; *];; ui_menu_file_for_finding_main_concept => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_pattern/ui_menu_file_for_finding_pattern_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_pattern/ui_menu_file_for_finding_pattern_content.scs index 39d3de1c..a4ab482c 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_pattern/ui_menu_file_for_finding_pattern_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_pattern/ui_menu_file_for_finding_pattern_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_pattern ui_menu_file_for_finding_pattern => ui_nrel_command_template: [* - action_search_structure_which_is_isomorphic_to_given_pattern _-> ._question_of_finding_pattern_instance + action_search_structure_which_is_isomorphic_to_given_pattern _-> ._action_of_finding_pattern_instance (* _-> ui_arg_1;; *);; - ._question_of_finding_pattern_instance _<- question;; + ._action_of_finding_pattern_instance <-_ action;; *];; ui_menu_file_for_finding_pattern => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_proof/ui_menu_file_for_finding_proof_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_proof/ui_menu_file_for_finding_proof_content.scs index a23c4954..1cb64a10 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_proof/ui_menu_file_for_finding_proof_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_proof/ui_menu_file_for_finding_proof_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_proof ui_menu_file_for_finding_proof => ui_nrel_command_template: [* - question_finding_proof _-> ._question_finding_proof_instance + action_finding_proof _-> ._action_finding_proof_instance (* _-> ui_arg_1;; *);; - ._question_finding_proof_instance _<- question;; + ._action_finding_proof_instance <-_ action;; *];; ui_menu_file_for_finding_proof => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_proof_steps/ui_menu_file_for_finding_proof_steps_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_proof_steps/ui_menu_file_for_finding_proof_steps_content.scs index d7e170d3..d9ca994b 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_proof_steps/ui_menu_file_for_finding_proof_steps_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_proof_steps/ui_menu_file_for_finding_proof_steps_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_proof_steps ui_menu_file_for_finding_proof_steps => ui_nrel_command_template: [* - question_finding_proof_steps _-> ._question_finding_proof_steps_instance + action_finding_proof_steps _-> ._action_finding_proof_steps_instance (* _-> ui_arg_1;; *);; - ._question_finding_proof_steps_instance _<- question;; + ._action_finding_proof_steps_instance <-_ action;; *];; ui_menu_file_for_finding_proof_steps => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_relation/ui_menu_file_for_finding_relation_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_relation/ui_menu_file_for_finding_relation_content.scs index f8bb645e..02a1bcd4 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_relation/ui_menu_file_for_finding_relation_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_relation/ui_menu_file_for_finding_relation_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_relation ui_menu_file_for_finding_relation => ui_nrel_command_template: [* - question_finding_relation _-> ._question_finding_relation_instance + action_finding_relation _-> ._action_finding_relation_instance (* _-> ui_arg_1;; *);; - ._question_finding_relation_instance _<- question;; + ._action_finding_relation_instance <-_ action;; *];; ui_menu_file_for_finding_relation => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_solution/ui_menu_file_for_finding_solution_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_solution/ui_menu_file_for_finding_solution_content.scs index 5391440b..9add47fd 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_solution/ui_menu_file_for_finding_solution_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_solution/ui_menu_file_for_finding_solution_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_solution ui_menu_file_for_finding_solution => ui_nrel_command_template: [* - question_of_finding_solution _-> ._question_of_finding_solution_instance + action_of_finding_solution _-> ._action_of_finding_solution_instance (* _-> ui_arg_1;; *);; - ._question_of_finding_solution_instance _<- question;; + ._action_of_finding_solution_instance <-_ action;; *];; ui_menu_file_for_finding_solution => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_statements/ui_menu_file_for_finding_statements_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_statements/ui_menu_file_for_finding_statements_content.scs index d573167c..a88ec9d6 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_statements/ui_menu_file_for_finding_statements_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_statements/ui_menu_file_for_finding_statements_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_statements ui_menu_file_for_finding_statements => ui_nrel_command_template: [* - question_of_finding_statements _-> ._question_of_finding_statements_instance + action_of_finding_statements _-> ._action_of_finding_statements_instance (* _-> ui_arg_1;; *);; - ._question_of_finding_statements_instance _<- question;; + ._action_of_finding_statements_instance <-_ action;; *];; ui_menu_file_for_finding_statements => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_theorems/ui_menu_file_for_finding_theorems_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_theorems/ui_menu_file_for_finding_theorems_content.scs index f422aa5e..d65ce7fa 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_theorems/ui_menu_file_for_finding_theorems_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_theorems/ui_menu_file_for_finding_theorems_content.scs @@ -19,11 +19,11 @@ ui_menu_file_for_finding_theorems ui_menu_file_for_finding_theorems => ui_nrel_command_template: [* - question_finding_theorems _-> ._question_finding_theorems_instance + action_finding_theorems _-> ._action_finding_theorems_instance (* _-> ui_arg_1;; *);; - ._question_finding_theorems_instance _<- question;; + ._action_finding_theorems_instance <-_ action;; *];; ui_menu_file_for_finding_theorems => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_translation/ui_menu_view_translation_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_translation/ui_menu_view_translation_content.scs index f4d33544..eb112ce4 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_translation/ui_menu_view_translation_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/authorized_users/without_context/find_translation/ui_menu_view_translation_content.scs @@ -19,12 +19,12 @@ ui_menu_view_translation ui_menu_view_translation => ui_nrel_command_template: [* - question_search_links_of_relation_connected_with_element _-> ._question_search_links_of_relation_connected_with_element_instance + action_search_links_of_relation_connected_with_element _-> ._action_search_links_of_relation_connected_with_element_instance (* _-> rrel_1:: ui_arg_1;; _-> rrel_2:: nrel_sc_text_translation;; *);; - ._question_search_links_of_relation_connected_with_element_instance _<- question;; + ._action_search_links_of_relation_connected_with_element_instance <-_ action;; *];; ui_menu_view_translation => ui_nrel_command_lang_template: [Как выглядит $ui_arg_1 на внешних языках] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_identifiers_in_the_agreed_part_of_kb/ui_menu_view_all_identifiers_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_identifiers_in_the_agreed_part_of_kb/ui_menu_view_all_identifiers_in_the_agreed_part_of_kb_content.scs index 81351199..7557e11f 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_identifiers_in_the_agreed_part_of_kb/ui_menu_view_all_identifiers_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_identifiers_in_the_agreed_part_of_kb/ui_menu_view_all_identifiers_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_view_all_identifiers_in_the_agreed_part_of_kb ui_menu_view_all_identifiers_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_search_all_identifiers _-> ._question_search_all_identifiers_instance + action_search_all_identifiers _-> ._action_search_all_identifiers_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_search_all_identifiers_instance _<- question;; + ._action_search_all_identifiers_instance <-_ action;; *];; ui_menu_view_all_identifiers_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: [Какие внешние идентификаторы соответствуют $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_input_const_pos_arc_in_the_agreed_part_of_kb/ui_menu_view_all_input_const_pos_arc_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_input_const_pos_arc_in_the_agreed_part_of_kb/ui_menu_view_all_input_const_pos_arc_in_the_agreed_part_of_kb_content.scs index 0bab1ca5..351bc6f2 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_input_const_pos_arc_in_the_agreed_part_of_kb/ui_menu_view_all_input_const_pos_arc_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_input_const_pos_arc_in_the_agreed_part_of_kb/ui_menu_view_all_input_const_pos_arc_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_view_all_input_const_pos_arc_in_the_agreed_part_of_kb ui_menu_view_all_input_const_pos_arc_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_search_all_input_const_pos_arcs _-> ._question_search_all_input_const_pos_arcs_instance + action_search_all_input_const_pos_arcs _-> ._action_search_all_input_const_pos_arcs_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_search_all_input_const_pos_arcs_instance _<- question;; + ._action_search_all_input_const_pos_arcs_instance <-_ action;; *];; ui_menu_view_all_input_const_pos_arc_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: [Элементом каких множеств является $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb/ui_menu_view_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb/ui_menu_view_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb_content.scs index cddeb2c0..00809a54 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb/ui_menu_view_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb/ui_menu_view_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_view_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb ui_menu_view_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_search_all_input_const_pos_arcs_with_rel _-> ._question_search_all_input_const_pos_arcs_with_rel_instance + action_search_all_input_const_pos_arcs_with_rel _-> ._action_search_all_input_const_pos_arcs_with_rel_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_search_all_input_const_pos_arcs_with_rel_instance _<- question;; + ._action_search_all_input_const_pos_arcs_with_rel_instance <-_ action;; *];; ui_menu_view_all_input_const_pos_arc_with_rel_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: [Элементом каких множеств является $ui_arg_1 и какие роли она там выполняет] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_output_const_pos_arc_in_the_agreed_part_of_kb/ui_menu_view_all_output_const_pos_arc_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_output_const_pos_arc_in_the_agreed_part_of_kb/ui_menu_view_all_output_const_pos_arc_in_the_agreed_part_of_kb_content.scs index 9621e5b7..75e63870 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_output_const_pos_arc_in_the_agreed_part_of_kb/ui_menu_view_all_output_const_pos_arc_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_output_const_pos_arc_in_the_agreed_part_of_kb/ui_menu_view_all_output_const_pos_arc_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_view_all_output_const_pos_arc_in_the_agreed_part_of_kb ui_menu_view_all_output_const_pos_arc_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_search_all_output_const_pos_arcs _-> ._question_search_all_output_const_pos_arcs_instance + action_search_all_output_const_pos_arcs _-> ._action_search_all_output_const_pos_arcs_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_search_all_output_const_pos_arcs_instance _<- question;; + ._action_search_all_output_const_pos_arcs_instance <-_ action;; *];; ui_menu_view_all_output_const_pos_arc_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: [Какие элементы принадлежат множеству $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb/ui_menu_view_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb/ui_menu_view_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb_content.scs index 2c4fbd3a..1a09ec53 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb/ui_menu_view_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb/ui_menu_view_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_view_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb ui_menu_view_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_search_all_output_const_pos_arcs_with_rel _-> ._question_search_all_output_const_pos_arcs_with_rel_instance + action_search_all_output_const_pos_arcs_with_rel _-> ._action_search_all_output_const_pos_arcs_with_rel_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_search_all_output_const_pos_arcs_with_rel_instance _<- question;; + ._action_search_all_output_const_pos_arcs_with_rel_instance <-_ action;; *];; ui_menu_view_all_output_const_pos_arc_with_rel_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: [Какие элементы принадлежат множеству $ui_arg_1 и какие роли они выполняют] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_subclasses_in_quasybinary_relation_in_the_agreed_part_of_kb/ui_menu_view_all_subclasses_in_quasybinary_relation_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_subclasses_in_quasybinary_relation_in_the_agreed_part_of_kb/ui_menu_view_all_subclasses_in_quasybinary_relation_in_the_agreed_part_of_kb_content.scs index a83c8777..a375cc0c 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_subclasses_in_quasybinary_relation_in_the_agreed_part_of_kb/ui_menu_view_all_subclasses_in_quasybinary_relation_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_subclasses_in_quasybinary_relation_in_the_agreed_part_of_kb/ui_menu_view_all_subclasses_in_quasybinary_relation_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_view_all_subclasses_in_quasybinary_relation_in_the_agreed_part_of_kb ui_menu_view_all_subclasses_in_quasybinary_relation_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_search_all_subclasses_in_quasybinary_relation _-> ._question_search_all_subclasses_in_quasybinary_relation_instance + action_search_all_subclasses_in_quasybinary_relation _-> ._action_search_all_subclasses_in_quasybinary_relation_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_search_all_subclasses_in_quasybinary_relation_instance _<- question;; + ._action_search_all_subclasses_in_quasybinary_relation_instance <-_ action;; *];; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_superclasses_in_quasybinary_relation_in_the_agreed_part_of_kb/ui_menu_view_all_superclasses_in_quasybinary_relation_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_superclasses_in_quasybinary_relation_in_the_agreed_part_of_kb/ui_menu_view_all_superclasses_in_quasybinary_relation_in_the_agreed_part_of_kb_content.scs index d1f380a2..a01273f2 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_superclasses_in_quasybinary_relation_in_the_agreed_part_of_kb/ui_menu_view_all_superclasses_in_quasybinary_relation_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_all_superclasses_in_quasybinary_relation_in_the_agreed_part_of_kb/ui_menu_view_all_superclasses_in_quasybinary_relation_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_view_all_superclasses_in_quasybinary_relation_in_the_agreed_part_of_kb ui_menu_view_all_superclasses_in_quasybinary_relation_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_search_all_superclasses_in_quasybinary_relation _-> ._question_search_all_superclasses_in_quasybinary_relation_instance + action_search_all_superclasses_in_quasybinary_relation _-> ._action_search_all_superclasses_in_quasybinary_relation_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_search_all_superclasses_in_quasybinary_relation_instance _<- question;; + ._action_search_all_superclasses_in_quasybinary_relation_instance <-_ action;; *];; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_decomposition_in_the_agreed_part_of_kb/ui_menu_view_decomposition_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_decomposition_in_the_agreed_part_of_kb/ui_menu_view_decomposition_in_the_agreed_part_of_kb_content.scs index de635ec2..38a9176f 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_decomposition_in_the_agreed_part_of_kb/ui_menu_view_decomposition_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_decomposition_in_the_agreed_part_of_kb/ui_menu_view_decomposition_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_view_decomposition_in_the_agreed_part_of_kb ui_menu_view_decomposition_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_search_decomposition _-> ._question_search_decomposition_instance + action_search_decomposition _-> ._action_search_decomposition_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_search_decomposition_instance _<- question;; + ._action_search_decomposition_instance <-_ action;; *];; ui_menu_view_decomposition_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: [Какие варианты декомпозиции соответствуют $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_definitions_in_the_agreed_part_of_kb/ui_menu_file_for_finding_definitions_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_definitions_in_the_agreed_part_of_kb/ui_menu_file_for_finding_definitions_in_the_agreed_part_of_kb_content.scs index 7b8f2924..2852b6c6 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_definitions_in_the_agreed_part_of_kb/ui_menu_file_for_finding_definitions_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_definitions_in_the_agreed_part_of_kb/ui_menu_file_for_finding_definitions_in_the_agreed_part_of_kb_content.scs @@ -13,12 +13,12 @@ ui_menu_file_for_finding_definitions_in_the_agreed_part_of_kb ui_menu_file_for_finding_definitions_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_of_finding_definitions _-> ._question_of_finding_definitions_instance + action_of_finding_definitions _-> ._action_of_finding_definitions_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_of_finding_definitions_instance _<- question;; + ._action_of_finding_definitions_instance <-_ action;; *];; ui_menu_file_for_finding_definitions_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_examples_in_the_agreed_part_of_kb/ui_menu_file_for_finding_examples_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_examples_in_the_agreed_part_of_kb/ui_menu_file_for_finding_examples_in_the_agreed_part_of_kb_content.scs index 8055d474..e89a5396 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_examples_in_the_agreed_part_of_kb/ui_menu_file_for_finding_examples_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_examples_in_the_agreed_part_of_kb/ui_menu_file_for_finding_examples_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_file_for_finding_examples_in_the_agreed_part_of_kb ui_menu_file_for_finding_examples_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_of_finding_examples _-> ._question_of_finding_examples_instance + action_of_finding_examples _-> ._action_of_finding_examples_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_of_finding_examples_instance _<- question;; + ._action_of_finding_examples_instance <-_ action;; *];; ui_menu_file_for_finding_examples_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_full_semantic_square_in_the_agreed_part_of_kb/ui_menu_view_full_semantic_square_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_full_semantic_square_in_the_agreed_part_of_kb/ui_menu_view_full_semantic_square_in_the_agreed_part_of_kb_content.scs index 5bf1a41b..3761d667 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_full_semantic_square_in_the_agreed_part_of_kb/ui_menu_view_full_semantic_square_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_full_semantic_square_in_the_agreed_part_of_kb/ui_menu_view_full_semantic_square_in_the_agreed_part_of_kb_content.scs @@ -26,12 +26,12 @@ ui_menu_view_full_semantic_neighborhood_in_the_agreed_part_of_kb ui_menu_view_full_semantic_neighborhood_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_search_full_semantic_neighborhood _-> ._question_search_full_semantic_neighborhood_instance + action_search_full_semantic_neighborhood _-> ._action_search_full_semantic_neighborhood_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_search_full_semantic_neighborhood_instance _<- question;; + ._action_search_full_semantic_neighborhood_instance <-_ action;; *];; ui_menu_view_full_semantic_neighborhood_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: [Что такое $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_key_concepts_in_the_agreed_part_of_kb/ui_menu_file_for_finding_key_concepts_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_key_concepts_in_the_agreed_part_of_kb/ui_menu_file_for_finding_key_concepts_in_the_agreed_part_of_kb_content.scs index b18351e5..ff14afc8 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_key_concepts_in_the_agreed_part_of_kb/ui_menu_file_for_finding_key_concepts_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_key_concepts_in_the_agreed_part_of_kb/ui_menu_file_for_finding_key_concepts_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_file_for_finding_key_concepts_in_the_agreed_part_of_kb ui_menu_file_for_finding_key_concepts_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_finding_key_concepts _-> ._question_finding_key_concepts_instance + action_finding_key_concepts _-> ._action_finding_key_concepts_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_finding_key_concepts_instance _<- question;; + ._action_finding_key_concepts_instance <-_ action;; *];; ui_menu_file_for_finding_key_concepts_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_links_of_relation_connected_with_element_in_the_agreed_part_of_kb/ui_menu_view_links_of_relation_connected_with_element_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_links_of_relation_connected_with_element_in_the_agreed_part_of_kb/ui_menu_view_links_of_relation_connected_with_element_in_the_agreed_part_of_kb_content.scs index 48bdc600..5b528bcf 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_links_of_relation_connected_with_element_in_the_agreed_part_of_kb/ui_menu_view_links_of_relation_connected_with_element_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_links_of_relation_connected_with_element_in_the_agreed_part_of_kb/ui_menu_view_links_of_relation_connected_with_element_in_the_agreed_part_of_kb_content.scs @@ -19,13 +19,13 @@ ui_menu_view_links_of_relation_connected_with_element_in_the_agreed_part_of_kb ui_menu_view_links_of_relation_connected_with_element_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_search_links_of_relation_connected_with_element _-> ._question_search_links_of_relation_connected_with_element_instance + action_search_links_of_relation_connected_with_element _-> ._action_search_links_of_relation_connected_with_element_instance (* _-> rrel_1:: ui_arg_1;; _-> rrel_2:: ui_arg_2;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_search_links_of_relation_connected_with_element_instance _<- question;; + ._action_search_links_of_relation_connected_with_element_instance <-_ action;; *];; ui_menu_view_links_of_relation_connected_with_element_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: [С какими элементами сущность $ui_arg_1 связана отношением $ui_arg_2] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_pattern_in_the_agreed_part_of_kb/ui_menu_file_for_finding_pattern_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_pattern_in_the_agreed_part_of_kb/ui_menu_file_for_finding_pattern_in_the_agreed_part_of_kb_content.scs index e54518be..1ebd575d 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_pattern_in_the_agreed_part_of_kb/ui_menu_file_for_finding_pattern_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_pattern_in_the_agreed_part_of_kb/ui_menu_file_for_finding_pattern_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_file_for_finding_pattern_in_the_agreed_part_of_kb ui_menu_file_for_finding_pattern_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - action_search_structure_which_is_isomorphic_to_given_pattern _-> ._question_of_finding_pattern_instance + action_search_structure_which_is_isomorphic_to_given_pattern _-> ._action_of_finding_pattern_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_of_finding_pattern_instance _<- question;; + ._action_of_finding_pattern_instance <-_ action;; *];; ui_menu_file_for_finding_pattern_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_theorems_in_the_agreed_part_of_kb/ui_menu_file_for_finding_theorems_in_the_agreed_part_of_kb_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_theorems_in_the_agreed_part_of_kb/ui_menu_file_for_finding_theorems_in_the_agreed_part_of_kb_content.scs index ddf6300f..63c79c23 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_theorems_in_the_agreed_part_of_kb/ui_menu_file_for_finding_theorems_in_the_agreed_part_of_kb_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/search/unauthorized_users/with_context/find_theorems_in_the_agreed_part_of_kb/ui_menu_file_for_finding_theorems_in_the_agreed_part_of_kb_content.scs @@ -19,12 +19,12 @@ ui_menu_file_for_finding_theorems_in_the_agreed_part_of_kb ui_menu_file_for_finding_theorems_in_the_agreed_part_of_kb => ui_nrel_command_template: [* - question_finding_theorems _-> ._question_finding_theorems_instance + action_finding_theorems _-> ._action_finding_theorems_instance (* _-> ui_arg_1;; _=> nrel_context_of_action:: concerted_part_of_specific_kb;; *);; - ._question_finding_theorems_instance _<- question;; + ._action_finding_theorems_instance <-_ action;; *];; ui_menu_file_for_finding_theorems_in_the_agreed_part_of_kb => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ui/specification/ui_menu_file_for_finding_connection_between_entity_and_alternative_of_specification/ui_menu_file_for_finding_connection_between_entity_and_alternative_of_specification_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ui/specification/ui_menu_file_for_finding_connection_between_entity_and_alternative_of_specification/ui_menu_file_for_finding_connection_between_entity_and_alternative_of_specification_content.scs index 52f2dcf6..7479e799 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ui/specification/ui_menu_file_for_finding_connection_between_entity_and_alternative_of_specification/ui_menu_file_for_finding_connection_between_entity_and_alternative_of_specification_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ui/specification/ui_menu_file_for_finding_connection_between_entity_and_alternative_of_specification/ui_menu_file_for_finding_connection_between_entity_and_alternative_of_specification_content.scs @@ -12,7 +12,7 @@ ui_menu_file_for_finding_connection_between_entity_and_alternative_of_specificat _-> rrel_1:: ui_arg_1;; _-> rrel_2:: ui_arg_2;; *);; - ._action_of_finding_connection_between_entity_and_alternative_of_specification_instance _<- question;; + ._action_of_finding_connection_between_entity_and_alternative_of_specification_instance <-_ action;; *];; ui_menu_file_for_finding_connection_between_entity_and_alternative_of_specification => ui_nrel_command_lang_template: [Найти связь между сущностью и альтернативой спецификации: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ui/specification/ui_menu_file_for_specifying_of_indicated_entity/ui_menu_file_for_specifying_of_indicated_entity_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ui/specification/ui_menu_file_for_specifying_of_indicated_entity/ui_menu_file_for_specifying_of_indicated_entity_content.scs index 6799307c..b15695e3 100755 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ui/specification/ui_menu_file_for_specifying_of_indicated_entity/ui_menu_file_for_specifying_of_indicated_entity_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/ui/specification/ui_menu_file_for_specifying_of_indicated_entity/ui_menu_file_for_specifying_of_indicated_entity_content.scs @@ -11,7 +11,7 @@ ui_menu_file_for_specifying_of_indicated_entity => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_of_request_assistance_of_entity_specification_instance _<- question;; + ._action_of_request_assistance_of_entity_specification_instance <-_ action;; *];; ui_menu_file_for_specifying_of_indicated_entity => ui_nrel_command_lang_template: [Cпецифицировать указываемую сущность: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_agent_check_cycle_exist_order_rel/ui_menu_agent_check_cycle_exist_order_rel_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_agent_check_cycle_exist_order_rel/ui_menu_agent_check_cycle_exist_order_rel_content.scs index b710f975..3fed4e14 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_agent_check_cycle_exist_order_rel/ui_menu_agent_check_cycle_exist_order_rel_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_agent_check_cycle_exist_order_rel/ui_menu_agent_check_cycle_exist_order_rel_content.scs @@ -15,7 +15,7 @@ ui_menu_file_for_checking_cycle_existence_of_ordering_relation => ui_nrel_comman (* _-> ui_arg_1;; *);; - ._action_of_checking_cycle_existence_of_ordering_relation_instance _<- question;; + ._action_of_checking_cycle_existence_of_ordering_relation_instance <-_ action;; *];; ui_menu_file_for_checking_cycle_existence_of_ordering_relation => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_agent_check_cycle_exist_order_rel_with_context/ui_menu_agent_check_cycle_exist_order_rel_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_agent_check_cycle_exist_order_rel_with_context/ui_menu_agent_check_cycle_exist_order_rel_with_context_content.scs index 4a8c6b06..bc4b4118 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_agent_check_cycle_exist_order_rel_with_context/ui_menu_agent_check_cycle_exist_order_rel_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_agent_check_cycle_exist_order_rel_with_context/ui_menu_agent_check_cycle_exist_order_rel_with_context_content.scs @@ -16,7 +16,7 @@ ui_menu_file_for_checking_cycle_existence_of_ordering_relation_with_context => u _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_of_checking_cycle_existence_of_ordering_relation_instance _<- question;; + ._action_of_checking_cycle_existence_of_ordering_relation_instance <-_ action;; *];; ui_menu_file_for_checking_cycle_existence_of_ordering_relation_with_context => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_cross_from_one_subdiv_elem/ui_menu_check_cross_from_one_subdiv_elem_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_cross_from_one_subdiv_elem/ui_menu_check_cross_from_one_subdiv_elem_content.scs index d92a2027..869e5128 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_cross_from_one_subdiv_elem/ui_menu_check_cross_from_one_subdiv_elem_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_cross_from_one_subdiv_elem/ui_menu_check_cross_from_one_subdiv_elem_content.scs @@ -10,7 +10,7 @@ action_of_check_for_crossing_from_one_subdividing_elements _-> ._action_of_check (* _-> ui_arg_1;; *);; - ._action_of_check_for_crossing_from_one_subdividing_elements_instance _<- question;; + ._action_of_check_for_crossing_from_one_subdividing_elements_instance <-_ action;; *];; ui_menu_file_for_check_for_crossing_from_one_subdividing_elements => ui_nrel_command_lang_template: [Проверить наличие непустого пересечения у элементов одного разбиения в рамках структуры: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_cross_from_one_subdiv_elem_with_context/ui_menu_check_cross_from_one_subdiv_elem_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_cross_from_one_subdiv_elem_with_context/ui_menu_check_cross_from_one_subdiv_elem_with_context_content.scs index c722faef..6e8b745b 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_cross_from_one_subdiv_elem_with_context/ui_menu_check_cross_from_one_subdiv_elem_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_cross_from_one_subdiv_elem_with_context/ui_menu_check_cross_from_one_subdiv_elem_with_context_content.scs @@ -11,7 +11,7 @@ action_of_check_for_crossing_from_one_subdividing_elements _-> ._action_of_check _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_of_check_for_crossing_from_one_subdividing_elements_instance _<- question;; + ._action_of_check_for_crossing_from_one_subdividing_elements_instance <-_ action;; *];; ui_menu_file_for_check_for_crossing_from_one_subdividing_elements_with_context => ui_nrel_command_lang_template: [Проверить наличие непустого пересечения у элементов одного разбиения в рамках структуры: $ui_arg_1 с заданным контекстом $ui_arg_2] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_exist_max_studied_obj_class/ui_menu_check_exist_max_studied_obj_class_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_exist_max_studied_obj_class/ui_menu_check_exist_max_studied_obj_class_content.scs index 94ff5723..d0150b05 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_exist_max_studied_obj_class/ui_menu_check_exist_max_studied_obj_class_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_exist_max_studied_obj_class/ui_menu_check_exist_max_studied_obj_class_content.scs @@ -9,7 +9,7 @@ ui_menu_file_for_checking_existence_of_max_studied_object_class => ui_nrel_comma (* _-> ui_arg_1;; *);; - ._action_of_checking_existence_of_max_studied_class_of_subject_domain_instance _<- question;; + ._action_of_checking_existence_of_max_studied_class_of_subject_domain_instance <-_ action;; *];; ui_menu_file_for_checking_existence_of_max_studied_object_class => ui_nrel_command_lang_template: [Проверить указание максимального класса объектов исследования у предметных областей: $ui_arg_1] (* <- lang_ru;;*);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_exist_max_studied_obj_class_with_context/ui_menu_check_exist_max_studied_obj_class_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_exist_max_studied_obj_class_with_context/ui_menu_check_exist_max_studied_obj_class_with_context_content.scs index 78a66067..210bd6c3 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_exist_max_studied_obj_class_with_context/ui_menu_check_exist_max_studied_obj_class_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_exist_max_studied_obj_class_with_context/ui_menu_check_exist_max_studied_obj_class_with_context_content.scs @@ -10,7 +10,7 @@ ui_menu_file_for_checking_existence_of_max_studied_object_class_with_context => _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_of_checking_existence_of_max_studied_class_of_subject_domain_instance _<- question;; + ._action_of_checking_existence_of_max_studied_class_of_subject_domain_instance <-_ action;; *];; ui_menu_file_for_checking_existence_of_max_studied_object_class_with_context => ui_nrel_command_lang_template: [Проверить указание максимального класса объектов исследования у предметных областей в рамках структуры $ui_arg_1 с заданным контекстом $ui_arg_2] (* <- lang_ru;;*);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_main_idtf_all_foreign_lang/ui_menu_check_main_idtf_all_foreign_lang_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_main_idtf_all_foreign_lang/ui_menu_check_main_idtf_all_foreign_lang_content.scs index d775b6ff..5fc33d9b 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_main_idtf_all_foreign_lang/ui_menu_check_main_idtf_all_foreign_lang_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_main_idtf_all_foreign_lang/ui_menu_check_main_idtf_all_foreign_lang_content.scs @@ -9,7 +9,7 @@ ui_menu_file_for_check_the_main_idtf_for_all_foreign_lang => ui_nrel_command_tem (* _-> ui_arg_1;; *);; - ._action_check_the_main_idtf_for_all_foreign_lang_instance _<- question;; + ._action_check_the_main_idtf_for_all_foreign_lang_instance <-_ action;; *];; ui_menu_file_for_check_the_main_idtf_for_all_foreign_lang => ui_nrel_command_lang_template: [Проверить наличие основных идентификаторов sc-элементов для всех внешних языков: $ui_arg_1] (* <- lang_ru;;*);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_main_idtf_all_foreign_lang_with_context/ui_menu_check_main_idtf_all_foreign_lang_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_main_idtf_all_foreign_lang_with_context/ui_menu_check_main_idtf_all_foreign_lang_with_context_content.scs index f0085a67..1e352b7c 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_main_idtf_all_foreign_lang_with_context/ui_menu_check_main_idtf_all_foreign_lang_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_check_main_idtf_all_foreign_lang_with_context/ui_menu_check_main_idtf_all_foreign_lang_with_context_content.scs @@ -10,7 +10,7 @@ ui_menu_file_for_check_the_main_idtf_for_all_foreign_lang_with_context <- ui_use _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_check_the_main_idtf_for_all_foreign_lang_instance _<- question;; + ._action_check_the_main_idtf_for_all_foreign_lang_instance <-_ action;; *];; ui_menu_file_for_check_the_main_idtf_for_all_foreign_lang_with_context => ui_nrel_command_lang_template: [Проверить наличие основных идентификаторов sc-элементов для всех внешних языков: $ui_arg_1 с заданным контекстом: $ui_arg_2] (* <- lang_ru;;*);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_content.scs index 9f731a82..043605a2 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_content.scs @@ -10,7 +10,7 @@ ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given (* _-> ui_arg_1;; *);; - ._action_of_checking_subject_domain_accessory_for_classes_in_given_structure_instance _<- question;; + ._action_of_checking_subject_domain_accessory_for_classes_in_given_structure_instance <-_ action;; *];; ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure=> ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_with_context/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_with_context/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_with_context_content.scs index 6d0948ff..ee0bd3fd 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_with_context/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_with_context/ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_with_context_content.scs @@ -11,7 +11,7 @@ ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_of_checking_subject_domain_accessory_for_classes_in_given_structure_instance _<- question;; + ._action_of_checking_subject_domain_accessory_for_classes_in_given_structure_instance <-_ action;; *];; ui_menu_file_for_agent_of_checking_subject_domain_accessory_for_classes_in_given_structure_with_context => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_concept_def_existence/ui_menu_file_for_checking_concept_def_existence_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_concept_def_existence/ui_menu_file_for_checking_concept_def_existence_content.scs index c0bf1d1e..e085aa1e 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_concept_def_existence/ui_menu_file_for_checking_concept_def_existence_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_concept_def_existence/ui_menu_file_for_checking_concept_def_existence_content.scs @@ -9,7 +9,7 @@ ui_menu_file_for_checking_concept_def_existence => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_to_check_concept_def_existence_instance _<- question;; + ._action_to_check_concept_def_existence_instance <-_ action;; *];; ui_menu_file_for_checking_concept_def_existence => ui_nrel_command_lang_template: [Проверить наличие определений или пояснений у понятий: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_concept_def_existence_with_context/ui_menu_file_for_checking_concept_def_existence_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_concept_def_existence_with_context/ui_menu_file_for_checking_concept_def_existence_with_context_content.scs index 7301e161..30670b95 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_concept_def_existence_with_context/ui_menu_file_for_checking_concept_def_existence_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_concept_def_existence_with_context/ui_menu_file_for_checking_concept_def_existence_with_context_content.scs @@ -10,7 +10,7 @@ ui_menu_file_for_checking_concept_def_existence_with_context => ui_nrel_command_ _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_to_check_concept_def_existence_instance _<- question;; + ._action_to_check_concept_def_existence_instance <-_ action;; *];; ui_menu_file_for_checking_concept_def_existence_with_context => ui_nrel_command_lang_template: [Проверить наличие определений или пояснений у понятий в рамках заданной структуры ($ui_arg_1) с заданным контекстом ($ui_arg_2)] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_domains_of_relation/ui_menu_file_for_checking_domains_of_relation_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_domains_of_relation/ui_menu_file_for_checking_domains_of_relation_content.scs index 83b41769..bb45b147 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_domains_of_relation/ui_menu_file_for_checking_domains_of_relation_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_domains_of_relation/ui_menu_file_for_checking_domains_of_relation_content.scs @@ -9,7 +9,7 @@ ui_menu_file_for_checking_domains_of_relation => ui_nrel_command_template: (* _-> ui_arg_1;; *);; - ._action_of_checking_domains_of_relation_instance _<- question;; + ._action_of_checking_domains_of_relation_instance <-_ action;; *];; ui_menu_file_for_checking_domains_of_relation => ui_nrel_command_lang_template: [Проверить наличиe доменов у отношения: $ui_arg_1] (* <- lang_ru;;*);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_any_main_identifier/ui_menu_file_for_checking_existence_of_any_main_identifier_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_any_main_identifier/ui_menu_file_for_checking_existence_of_any_main_identifier_content.scs index 14c0f2ea..189cc5d2 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_any_main_identifier/ui_menu_file_for_checking_existence_of_any_main_identifier_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_any_main_identifier/ui_menu_file_for_checking_existence_of_any_main_identifier_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_checking_existence_of_any_main_identifier => ui_nrel_command_te (* _-> ui_arg_1;; *);; - ._action_to_find_sc_elements_without_any_main_identifier_instance _<- question;; + ._action_to_find_sc_elements_without_any_main_identifier_instance <-_ action;; *];; ui_menu_file_for_checking_existence_of_any_main_identifier => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_any_main_identifier_with_context/ui_menu_file_for_checking_existence_of_any_main_identifier_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_any_main_identifier_with_context/ui_menu_file_for_checking_existence_of_any_main_identifier_with_context_content.scs index 52f2fa42..cd02282d 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_any_main_identifier_with_context/ui_menu_file_for_checking_existence_of_any_main_identifier_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_any_main_identifier_with_context/ui_menu_file_for_checking_existence_of_any_main_identifier_with_context_content.scs @@ -14,7 +14,7 @@ ui_menu_file_for_checking_existence_of_any_main_identifier_with_context => ui_nr _-> ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_to_find_sc_elements_without_any_main_identifier_instance _<- question;; + ._action_to_find_sc_elements_without_any_main_identifier_instance <-_ action;; *];; ui_menu_file_for_checking_existence_of_any_main_identifier_with_context => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_measure_or_scale_of_parameter/ui_menu_file_for_checking_existence_of_measure_or_scale_of_parameter_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_measure_or_scale_of_parameter/ui_menu_file_for_checking_existence_of_measure_or_scale_of_parameter_content.scs index 43b70600..e17a9f39 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_measure_or_scale_of_parameter/ui_menu_file_for_checking_existence_of_measure_or_scale_of_parameter_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_measure_or_scale_of_parameter/ui_menu_file_for_checking_existence_of_measure_or_scale_of_parameter_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_checking_existence_of_measure_or_scale_of_parameter => ui_nrel_ (* _-> ui_arg_1;; *);; - ._action_to_check_indication_of_scale_or_measure_for_values_of_parameters_within_given_structure_instance _<- question;; + ._action_to_check_indication_of_scale_or_measure_for_values_of_parameters_within_given_structure_instance <-_ action;; *];; ui_menu_file_for_checking_existence_of_measure_or_scale_of_parameter => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_using_const_for_def/ui_menu_file_for_checking_existence_of_using_const_for_def_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_using_const_for_def/ui_menu_file_for_checking_existence_of_using_const_for_def_content.scs index d0c9c764..dc4d3a13 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_using_const_for_def/ui_menu_file_for_checking_existence_of_using_const_for_def_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_using_const_for_def/ui_menu_file_for_checking_existence_of_using_const_for_def_content.scs @@ -9,7 +9,7 @@ ui_menu_file_for_checking_existence_of_using_const_for_def => ui_nrel_command_te (* _-> rrel_1:: ui_arg_1;; *);; - ._action_to_check_existence_of_using_const_for_def_instance _<- question;; + ._action_to_check_existence_of_using_const_for_def_instance <-_ action;; *];; ui_menu_file_for_checking_existence_of_using_const_for_def => ui_nrel_command_lang_template: [Проверить указание используемых констант для определений понятий: $ui_arg_1] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_using_const_for_def_with_context/ui_menu_file_for_checking_existence_of_using_const_for_def_with_context_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_using_const_for_def_with_context/ui_menu_file_for_checking_existence_of_using_const_for_def_with_context_content.scs index 4fa3907b..c08bfd6f 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_using_const_for_def_with_context/ui_menu_file_for_checking_existence_of_using_const_for_def_with_context_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_existence_of_using_const_for_def_with_context/ui_menu_file_for_checking_existence_of_using_const_for_def_with_context_content.scs @@ -10,7 +10,7 @@ ui_menu_file_for_checking_existence_of_using_const_for_def_with_context => ui_nr _-> rrel_1:: ui_arg_1;; _=> nrel_context_of_action:: ui_arg_2;; *);; - ._action_to_check_existence_of_using_const_for_def_instance _<- question;; + ._action_to_check_existence_of_using_const_for_def_instance <-_ action;; *];; ui_menu_file_for_checking_existence_of_using_const_for_def_with_context => ui_nrel_command_lang_template: [Проверить указание используемых констант для определений понятий: $ui_arg_1 в рамках контекста: $ui_arg_2] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure/ui_menu_file_for_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure/ui_menu_file_for_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure_content.scs index a0f0d92f..c5dfae34 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure/ui_menu_file_for_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure/ui_menu_file_for_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure_content.scs @@ -10,7 +10,7 @@ ui_menu_file_for_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_g (* _-> ui_arg_1;; *);; - ._action_of_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure_instance _<- question;; + ._action_of_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure_instance <-_ action;; *];; ui_menu_file_for_checking_key_sc_elements_of_the_semantic_neighborhoods_in_the_given_structure => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_right_domain_of_relations/ui_menu_file_for_verification_compliance_of_sheaf_pow_with_relation_arity_content.scs b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_right_domain_of_relations/ui_menu_file_for_verification_compliance_of_sheaf_pow_with_relation_arity_content.scs index d72178d2..989db4d6 100644 --- a/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_right_domain_of_relations/ui_menu_file_for_verification_compliance_of_sheaf_pow_with_relation_arity_content.scs +++ b/sc-models/user-interface/kb/extended/sectn_lib_of_reusable_comp_ui/ui_menu/verification/ui_menu_file_for_checking_right_domain_of_relations/ui_menu_file_for_verification_compliance_of_sheaf_pow_with_relation_arity_content.scs @@ -13,7 +13,7 @@ ui_menu_file_for_verification_compliance_of_sheaf_pow_with_relation_arity => ui_ (* _-> ui_arg_1;; *);; - ._action_of_verification_compliance_of_sheaf_pow_with_relation_arity_instance _<- question;; + ._action_of_verification_compliance_of_sheaf_pow_with_relation_arity_instance <-_ action;; *];; ui_menu_file_for_verification_compliance_of_sheaf_pow_with_relation_arity => ui_nrel_command_lang_template: diff --git a/sc-models/user-interface/kb/extended/ui/menu/ui_menu_view_get_decomposition.scs b/sc-models/user-interface/kb/extended/ui/menu/ui_menu_view_get_decomposition.scs index 2ba5e5c4..72ee0041 100644 --- a/sc-models/user-interface/kb/extended/ui/menu/ui_menu_view_get_decomposition.scs +++ b/sc-models/user-interface/kb/extended/ui/menu/ui_menu_view_get_decomposition.scs @@ -9,5 +9,5 @@ ui_menu_view_get_decomposition => ui_nrel_command_template: _-> rrel_3::ui_arg_3;; _-> rrel_4::ui_arg_4;; *);; - ._action_get_decomposition_instance _<- question;; + ._action_get_decomposition_instance <-_ action;; *];; diff --git a/sc-models/user-interface/kb/extended/ui/model/ui_command_finished.scs b/sc-models/user-interface/kb/extended/ui/model/ui_command_finished.scs index f42e523f..61e335bd 100644 --- a/sc-models/user-interface/kb/extended/ui/model/ui_command_finished.scs +++ b/sc-models/user-interface/kb/extended/ui/model/ui_command_finished.scs @@ -1,3 +1,3 @@ -ui_command_finished <- sc_node_not_relation;; +ui_command_finished <- sc_node_class;; ui_command_finished => nrel_main_idtf: [завершенная команда пользовательского интерфейса] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/ui/model/ui_command_generate_instance.scs b/sc-models/user-interface/kb/extended/ui/model/ui_command_generate_instance.scs index 5d81827a..d0db0ed2 100644 --- a/sc-models/user-interface/kb/extended/ui/model/ui_command_generate_instance.scs +++ b/sc-models/user-interface/kb/extended/ui/model/ui_command_generate_instance.scs @@ -1,3 +1,3 @@ -ui_command_generate_instance <- sc_node_not_relation;; +ui_command_generate_instance <- sc_node_class;; ui_command_generate_instance => nrel_main_idtf: [команда генерации экземпляра пользовательской команды] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/ui/model/ui_command_initiated.scs b/sc-models/user-interface/kb/extended/ui/model/ui_command_initiated.scs index 024ac3d2..786b1b06 100644 --- a/sc-models/user-interface/kb/extended/ui/model/ui_command_initiated.scs +++ b/sc-models/user-interface/kb/extended/ui/model/ui_command_initiated.scs @@ -1,3 +1,3 @@ -ui_command_initiated <- sc_node_not_relation;; +ui_command_initiated <- sc_node_class;; ui_command_initiated => nrel_main_idtf: [инициированная команда пользовательского интерфейса] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/ui/model/ui_command_translate.scs b/sc-models/user-interface/kb/extended/ui/model/ui_command_translate.scs index c420bf2e..b0a5a4b1 100644 --- a/sc-models/user-interface/kb/extended/ui/model/ui_command_translate.scs +++ b/sc-models/user-interface/kb/extended/ui/model/ui_command_translate.scs @@ -1,6 +1,6 @@ /*-- ui_command_translate --*/ -ui_command_translate <- sc_node_not_relation;; +ui_command_translate <- sc_node_class;; /* identifiers */ ui_command_translate => nrel_main_idtf: [команда трансляции] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/ui/model/ui_command_translate_from_sc.scs b/sc-models/user-interface/kb/extended/ui/model/ui_command_translate_from_sc.scs index 1a2314a2..238742f0 100644 --- a/sc-models/user-interface/kb/extended/ui/model/ui_command_translate_from_sc.scs +++ b/sc-models/user-interface/kb/extended/ui/model/ui_command_translate_from_sc.scs @@ -1,3 +1,3 @@ -ui_command_translate_from_sc <- sc_node_not_relation;; +ui_command_translate_from_sc <- sc_node_class;; ui_command_translate_from_sc => nrel_main_idtf: [команда трансялции из SC-кода на внешний язык] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/ui/model/ui_command_translate_to_sc.scs b/sc-models/user-interface/kb/extended/ui/model/ui_command_translate_to_sc.scs index 89444b86..5d8e32b7 100644 --- a/sc-models/user-interface/kb/extended/ui/model/ui_command_translate_to_sc.scs +++ b/sc-models/user-interface/kb/extended/ui/model/ui_command_translate_to_sc.scs @@ -1,4 +1,4 @@ -ui_command_translate_to_sc <- sc_node_not_relation;; +ui_command_translate_to_sc <- sc_node_class;; ui_command_translate_to_sc => nrel_main_idtf: [команда трансляции с внешнего языка в SC-код] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/ui/model/ui_descr_initiate_order.scs b/sc-models/user-interface/kb/extended/ui/model/ui_descr_initiate_order.scs index 4bf98187..384f3e2e 100644 --- a/sc-models/user-interface/kb/extended/ui/model/ui_descr_initiate_order.scs +++ b/sc-models/user-interface/kb/extended/ui/model/ui_descr_initiate_order.scs @@ -1,5 +1,5 @@ ui_descr_initiate_order -<- sc_node_not_relation; +<- sc_node_class; <= nrel_inclusion: semantic_neighborhood; diff --git a/sc-models/user-interface/kb/extended/ui/model/ui_descr_oper_semantic_commands.scs b/sc-models/user-interface/kb/extended/ui/model/ui_descr_oper_semantic_commands.scs index 5860ecba..ee863f3f 100644 --- a/sc-models/user-interface/kb/extended/ui/model/ui_descr_oper_semantic_commands.scs +++ b/sc-models/user-interface/kb/extended/ui/model/ui_descr_oper_semantic_commands.scs @@ -1,5 +1,5 @@ ui_descr_oper_semantic_commands -<- sc_node_not_relation; +<- sc_node_class; <= nrel_inclusion: semantic_neighborhood; diff --git a/sc-models/user-interface/kb/extended/ui/model/ui_descr_oper_semantic_control.scs b/sc-models/user-interface/kb/extended/ui/model/ui_descr_oper_semantic_control.scs index 28371832..272d3cc6 100644 --- a/sc-models/user-interface/kb/extended/ui/model/ui_descr_oper_semantic_control.scs +++ b/sc-models/user-interface/kb/extended/ui/model/ui_descr_oper_semantic_control.scs @@ -1,5 +1,5 @@ ui_descr_oper_semantic_control -<- sc_node_not_relation; +<- sc_node_class; <= nrel_inclusion: semantic_neighborhood; diff --git a/sc-models/user-interface/kb/extended/ui/model/ui_user_command.scs b/sc-models/user-interface/kb/extended/ui/model/ui_user_command.scs index 2d2f8580..764f7d47 100644 --- a/sc-models/user-interface/kb/extended/ui/model/ui_user_command.scs +++ b/sc-models/user-interface/kb/extended/ui/model/ui_user_command.scs @@ -27,7 +27,7 @@ ui_user_command_class { ui_user_command_class_view_kb; ui_user_command_class_edit_kb; - ui_user_command_class_question; + ui_user_command_class_action; ui_user_command_class_edit_file; ui_user_command_class_view_file; ui_user_command_class_control_dialog @@ -69,7 +69,7 @@ ui_user_command_class_edit_kb => nrel_main_idtf: [класс пользовательских команд редактирования базы знаний] (* <- lang_ru;; *);; -ui_user_command_class_question +ui_user_command_class_action => nrel_main_idtf: [класс пользовательских команд инициирующих вопрос системе] (* <- lang_ru;; *);; @@ -87,7 +87,7 @@ ui_user_command_class_control_dialog // -------------- Relations ----------------- ui_nrel_command_init_sequence -<- sc_node_norole_relation; +<- sc_node_non_role_relation; <- quasybinary_relation; => nrel_main_idtf: [последовательность элементарных действий инициирующих команду*] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/ui/nrel/nrel_ui_commands_decomposition.scs b/sc-models/user-interface/kb/extended/ui/nrel/nrel_ui_commands_decomposition.scs index 44ea194a..3345aadb 100644 --- a/sc-models/user-interface/kb/extended/ui/nrel/nrel_ui_commands_decomposition.scs +++ b/sc-models/user-interface/kb/extended/ui/nrel/nrel_ui_commands_decomposition.scs @@ -1,7 +1,7 @@ nrel_ui_commands_decomposition <- quasybinary_relation; <- decomposition_relation; -<- sc_node_norole_relation; +<- sc_node_non_role_relation; => nrel_main_idtf: [декомпозиция команд пользовательского интерфейса*] diff --git a/sc-models/user-interface/kb/extended/ui/ui_no_argument_command_class.scs b/sc-models/user-interface/kb/extended/ui/ui_no_argument_command_class.scs index 980253ed..f48bd1a7 100755 --- a/sc-models/user-interface/kb/extended/ui/ui_no_argument_command_class.scs +++ b/sc-models/user-interface/kb/extended/ui/ui_no_argument_command_class.scs @@ -1,5 +1,5 @@ ui_no_argument_command_class -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [класс команд без аргументов] (* <- lang_ru;; *); diff --git a/sc-models/user-interface/kb/extended/ui/ui_nrel_command_result.scs b/sc-models/user-interface/kb/extended/ui/ui_nrel_command_result.scs index 83c8feaf..18db52a6 100644 --- a/sc-models/user-interface/kb/extended/ui/ui_nrel_command_result.scs +++ b/sc-models/user-interface/kb/extended/ui/ui_nrel_command_result.scs @@ -1,3 +1,3 @@ -ui_nrel_command_result <- sc_node_norole_relation;; +ui_nrel_command_result <- sc_node_non_role_relation;; ui_nrel_command_result => nrel_main_idtf: [результат выполнения команды пользовательского интерфейса*] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/ui/ui_nrel_user_answer_formats.scs b/sc-models/user-interface/kb/extended/ui/ui_nrel_user_answer_formats.scs index 502c22d7..0643b96d 100644 --- a/sc-models/user-interface/kb/extended/ui/ui_nrel_user_answer_formats.scs +++ b/sc-models/user-interface/kb/extended/ui/ui_nrel_user_answer_formats.scs @@ -1,3 +1,3 @@ -ui_nrel_user_answer_formats <- sc_node_norole_relation;; +ui_nrel_user_answer_formats <- sc_node_non_role_relation;; ui_nrel_user_answer_formats => nrel_main_idtf: [множество форматов для вывода ответа пользователю*] (* <- lang_ru;; *);; diff --git a/sc-models/user-interface/kb/extended/ui/ui_one_argument_command_class.scs b/sc-models/user-interface/kb/extended/ui/ui_one_argument_command_class.scs index 8b3207d0..18537e66 100755 --- a/sc-models/user-interface/kb/extended/ui/ui_one_argument_command_class.scs +++ b/sc-models/user-interface/kb/extended/ui/ui_one_argument_command_class.scs @@ -1,5 +1,5 @@ ui_one_argument_command_class -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [класс команд с одним аргументом] (* <- lang_ru;; *); diff --git a/sc-models/user-interface/kb/extended/ui/ui_start_help.scs b/sc-models/user-interface/kb/extended/ui/ui_start_help.scs index f671719d..04e58e28 100644 --- a/sc-models/user-interface/kb/extended/ui/ui_start_help.scs +++ b/sc-models/user-interface/kb/extended/ui/ui_start_help.scs @@ -3,7 +3,7 @@ => nrel_system_identifier: [ui_start_help]; => nrel_format: format_html;; -"file://ui_start_help/help-question-movie.gif" +"file://ui_start_help/help-action-movie.gif" <- image; - => nrel_system_identifier: [ui_help_question_movie]; + => nrel_system_identifier: [ui_help_action_movie]; => nrel_format: format_png;; diff --git a/sc-models/user-interface/kb/extended/ui/ui_start_help/text.html b/sc-models/user-interface/kb/extended/ui/ui_start_help/text.html index 9d93d32c..a786165d 100644 --- a/sc-models/user-interface/kb/extended/ui/ui_start_help/text.html +++ b/sc-models/user-interface/kb/extended/ui/ui_start_help/text.html @@ -1,6 +1,6 @@

    Как пользоваться системой?

    Пользовательский интерфейс системы состоит из главного окна в рамках которого размещены все элементы управления. Диалог с системой осуществляется путем обмена сообщениями. Сообщение формируется следующим образом:

    - +

    В качестве аргументов запросов могут выступать любые элементы в рамках главного окна (при наведении на них справа от курсора появляется небольшая надпись sc). Используя эту возможность вы можете получить справку по всему пользовательскому интерфейсу.

    diff --git a/sc-models/user-interface/kb/extended/ui/ui_two_argument_command_class.scs b/sc-models/user-interface/kb/extended/ui/ui_two_argument_command_class.scs index d3a16d5b..b3429ada 100755 --- a/sc-models/user-interface/kb/extended/ui/ui_two_argument_command_class.scs +++ b/sc-models/user-interface/kb/extended/ui/ui_two_argument_command_class.scs @@ -1,5 +1,5 @@ ui_two_argument_command_class -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [класс команд с двумя аргументами] (* <- lang_ru;; *); diff --git a/sc-models/user-interface/kb/extended/ui/ui_user.scs b/sc-models/user-interface/kb/extended/ui/ui_user.scs index c1710963..8281ef25 100644 --- a/sc-models/user-interface/kb/extended/ui/ui_user.scs +++ b/sc-models/user-interface/kb/extended/ui/ui_user.scs @@ -1,5 +1,5 @@ ui_user -<- sc_node_not_relation; +<- sc_node_class; => nrel_main_idtf: [пользователь] diff --git a/sc-models/user-interface/kb/extended/ui/ui_user_registered.scs b/sc-models/user-interface/kb/extended/ui/ui_user_registered.scs index 53339718..730a4ac9 100644 --- a/sc-models/user-interface/kb/extended/ui/ui_user_registered.scs +++ b/sc-models/user-interface/kb/extended/ui/ui_user_registered.scs @@ -1,4 +1,4 @@ -ui_user_registered <- sc_node_not_relation; ui_user;; +ui_user_registered <- sc_node_class; ui_user;; ui_user_registered => nrel_main_idtf: [зарегистрированный пользователь] (* <- lang_ru;; *);; ui_user_registered => nrel_main_idtf: [registered user] (* <- lang_en;; *);; diff --git a/scripts/install_py_ps_deps.sh b/scripts/install_py_ps_deps.sh index 86f57c99..46647ba0 100755 --- a/scripts/install_py_ps_deps.sh +++ b/scripts/install_py_ps_deps.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash source "$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)/set_vars.sh" -pip3 install -r "$METASYSTEM_PATH/platform-dependent-components/problem-solver/py/requirements.txt" +python3 -m venv "${METASYSTEM_PY_SOURCES_PATH}/.venv" +source "${METASYSTEM_PY_SOURCES_PATH}/.venv/bin/activate" +pip3 install -r "${METASYSTEM_PY_SOURCES_PATH}/requirements.txt" diff --git a/scripts/run_py_ps.sh b/scripts/run_py_ps.sh index 3d2a75ac..c494379a 100755 --- a/scripts/run_py_ps.sh +++ b/scripts/run_py_ps.sh @@ -3,4 +3,5 @@ set -eo pipefail source "$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)/set_vars.sh" -python3 "${METASYSTEM_PATH}/platform-dependent-components/problem-solver/py/server.py" "$@" +# source "${METASYSTEM_PY_SOURCES_PATH}/.venv/bin/activate" +python3 "${METASYSTEM_PY_SOURCES_PATH}/server.py" "$@" diff --git a/scripts/run_sc_web.sh b/scripts/run_sc_web.sh index a1405ac0..a2ac09ba 100755 --- a/scripts/run_sc_web.sh +++ b/scripts/run_sc_web.sh @@ -6,4 +6,5 @@ then source "$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"/set_vars.sh fi -python3 "${SC_WEB_PATH}/server/app.py" --allowed_origins=http://localhost:3000 +source "${SC_WEB_PATH}/.venv/bin/activate" +"${SC_WEB_PATH}/scripts/run_sc_web.sh" --allowed_origins=http://localhost:3000 diff --git a/scripts/set_vars.sh b/scripts/set_vars.sh index 1ab520f5..243666af 100755 --- a/scripts/set_vars.sh +++ b/scripts/set_vars.sh @@ -7,6 +7,7 @@ export METASYSTEM_PATH="${METASYSTEM_PATH:-${ROOT_PATH}}" export METASYSTEM_CMAKE_PATH="${METASYSTEM_CMAKE_PATH:-${ROOT_PATH}}" export METASYSTEM_CXX_SOURCES_PATH="${METASYSTEM_PATH}/platform-dependent-components/problem-solver" +export METASYSTEM_PY_SOURCES_PATH="${METASYSTEM_PATH}/platform-dependent-components/problem-solver/py" export METASYSTEM_BUILD_PATH="${METASYSTEM_BUILD_PATH:-${METASYSTEM_CMAKE_PATH}/build}" export BINARY_PATH="${BINARY_PATH:-${METASYSTEM_CMAKE_PATH}/bin}" @@ -15,7 +16,13 @@ export REPO_PATH_FILE="${REPO_PATH_FILE:-${METASYSTEM_PATH}/repo.path}" export PLATFORM_PATH="${PLATFORM_PATH:-${METASYSTEM_PATH}/ostis-web-platform}" -export SC_WEB_BRANCH="${SC_WEB_BRANCH:-feature/add-scg-iframe}" +export SC_WEB_REPO="${SC_WEB_REPO:-https://github.com/NikitaZotov/sc-web.git}" +export SC_WEB_BRANCH="${SC_WEB_BRANCH:-feat/harmonise_sc_types}" +export SC_WEB_COMMIT="${SC_WEB_COMMIT:-""}" + +export SC_MACHINE_REPO="${SC_MACHINE_REPO:-https://github.com/NikitaZotov/sc-machine.git}" +export SC_MACHINE_BRANCH="${SC_MACHINE_BRANCH:-fix/kb_builder_config}" +export SC_MACHINE_COMMIT="${SC_MACHINE_COMMIT:-""}" export REACT_SC_WEB_REPO="${REACT_SC_WEB_REPO:-https://github.com/ostis-ai/react-sc-web}" export REACT_SC_WEB_PATH="${REACT_SC_WEB_PATH:-${METASYSTEM_PATH}/platform-dependent-components/interface/react-sc-web}"