Harmonise role relations for operator operands #31
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kilativ-dotcom
requested changes
Nov 18, 2024
| @@ -3,6 +3,7 @@ project(scp-machine) | |||
| set(CMAKE_CXX_STANDARD 17) | |||
| get_filename_component(PARENT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY) | |||
|
|
|||
| set(CMAKE_BUILD_TYPE Debug) | |||
There was a problem hiding this comment.
yes, it enables logs
| _-> rrel_1:: rrel_fixed:: rrel_scp_var:: .._action;; | ||
| _-> rrel_2:: rrel_assign:: rrel_scp_var:: rrel_const_perm_pos_arc:: .._arc1;; | ||
| _-> rrel_3:: rrel_assign:: rrel_scp_var:: rrel_const:: rrel_node:: .._param;; | ||
| _-> rrel_4:: rrel_assign:: rrel_scp_var:: rrel_const_perm_pos_arc:: .._arc2;; |
| @@ -0,0 +1,165 @@ | |||
| agent_program_search_all_outgoing_arcs_with_relations | |||
| => nrel_main_idtf: | |||
| [агентная scp-программа поиска всех выходящих sc-дуг с отношениями] (* <- lang_ru;; *); | |||
There was a problem hiding this comment.
Suggested change
| [агентная scp-программа поиска всех выходящих sc-дуг с отношениями] (* <- lang_ru;; *); | |
| [агентная scp-программа поиска всех выходящих базовых sc-дуг с отношениями] (* <- lang_ru;; *); |
| <-_ genElStr5;; | ||
|
|
||
| _-> rrel_1:: rrel_fixed:: rrel_scp_var:: .._action;; | ||
| _-> rrel_2:: rrel_assign:: rrel_scp_var:: rrel_const:: rrel_common_arc:: rrel_arc:: .._arc1;; |
There was a problem hiding this comment.
this one has rrel_common_arc and rrel_arc, second one can be removed
| @@ -0,0 +1,54 @@ | |||
| sc_agent_search_all_outgoing_arcs_with_relations | |||
| => nrel_main_idtf: | |||
| [sc-агент поиска всех выходящих sc-дуг с отношениями] (* <- lang_ru;; *); | |||
There was a problem hiding this comment.
Suggested change
| [sc-агент поиска всех выходящих sc-дуг с отношениями] (* <- lang_ru;; *); | |
| [sc-агент поиска всех выходящих базовых sc-дуг с отношениями] (* <- lang_ru;; *); |
scp/scpKeynodes.hpp
Outdated
|
|
||
| // Node types | ||
| static inline ScKeynode const rrel_struct{"rrel_struct"}; | ||
| static inline ScKeynode const rrel_fuz_arc{"rrel_fuz", ScType::ConstNodeRole}; |
There was a problem hiding this comment.
Suggested change
| static inline ScKeynode const rrel_fuz_arc{"rrel_fuz", ScType::ConstNodeRole}; | |
| static inline ScKeynode const rrel_fuz_arc{"rrel_fuz_arc", ScType::ConstNodeRole}; |
| @@ -277,13 +279,17 @@ void SCPOperand::resolveModifiers() | |||
| element_type = element_type | ScType::Node; | |||
| continue; | |||
| } | |||
| if (modifier == Keynodes::rrel_link) | |||
| if (modifier == Keynodes::rrel_node_link || modifier == Keynodes::rrel_link) | |||
There was a problem hiding this comment.
you should replace old roles with new roles in ims as well
scp/scpOperand.cpp
Outdated
Comment on lines
284
to
285
| if (modifier == Keynodes::rrel_link) | ||
| SCP_LOG_WARNING("Role relation `rrel_link` is deprecated. Use role relation `rrel_node_link` instead."); |
There was a problem hiding this comment.
do this with some map instead of 5000 copy-pastes
There was a problem hiding this comment.
I don't understand why, but have it your way.
Comment on lines
+49
to
+63
| @input_arc = (.._subscription_element _-> .._action);; | ||
| .._process | ||
| <-_ scp_process; | ||
|
|
||
| _-> rrel_1:: rrel_in:: _event; | ||
| _-> rrel_2:: rrel_in:: @input_arc; | ||
|
|
||
| <=_ nrel_decomposition_of_action:: _... | ||
| (* | ||
| _-> rrel_1:: .._operator1 | ||
| (* | ||
| <-_ searchElStr3;; | ||
|
|
||
| _-> rrel_1:: rrel_assign:: rrel_scp_var:: .._subscription_element;; | ||
| _-> rrel_2:: rrel_fixed:: rrel_scp_const:: @input_arc;; |
There was a problem hiding this comment.
Suggested change
| @input_arc = (.._subscription_element _-> .._action);; | |
| .._process | |
| <-_ scp_process; | |
| _-> rrel_1:: rrel_in:: _event; | |
| _-> rrel_2:: rrel_in:: @input_arc; | |
| <=_ nrel_decomposition_of_action:: _... | |
| (* | |
| _-> rrel_1:: .._operator1 | |
| (* | |
| <-_ searchElStr3;; | |
| _-> rrel_1:: rrel_assign:: rrel_scp_var:: .._subscription_element;; | |
| _-> rrel_2:: rrel_fixed:: rrel_scp_const:: @input_arc;; | |
| .._process | |
| <-_ scp_process; | |
| _-> rrel_1:: rrel_in:: _event; | |
| _-> rrel_2:: rrel_in:: _input_arc; | |
| <=_ nrel_decomposition_of_action:: _... | |
| (* | |
| _-> rrel_1:: .._operator1 | |
| (* | |
| <-_ searchElStr3;; | |
| _-> rrel_1:: rrel_assign:: rrel_scp_var:: .._subscription_element;; | |
| _-> rrel_2:: rrel_fixed:: rrel_scp_const:: _input_arc;; |
| loader.loadScsFile(context, TEST_AGENT_FILES_DIR_PATH + "agent1_proc.scs"); | ||
| loader.loadScsFile(context, TEST_AGENT_FILES_DIR_PATH + "proc_find_all_input.scs"); | ||
| loader.loadScsFile(context, TEST_AGENT_FILES_DIR_PATH + "sc_agent1.scs"); | ||
| loader.loadScsFile(context, TEST_AGENT_FILES_DIR_PATH + "agent_program_search_all_outgoing_arcs_with_relations.scs"); |
There was a problem hiding this comment.
Tests do not work macOS
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.