Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

CSV parser and eliminate cycles #46

Merged
merged 55 commits into from
Aug 24, 2023
Merged

CSV parser and eliminate cycles #46

merged 55 commits into from
Aug 24, 2023

Conversation

vanoha
Copy link
Contributor

@vanoha vanoha commented Aug 22, 2023

Upgraded parser of work graph that received from .csv file:

  • solved some bugs
  • upgraded algo of removing cycles
  • rewriting some code in history.py, which increased performance (added matrix calculation)
  • a user behavior script appeared: the user can decide what stage of data readiness he/she is currently in (is data has expert info, that shouldn't be removed during restore links based on history)

vanoha01 and others added 30 commits June 26, 2023 15:07
- read input work graph (file in .csv format);
- preprocess received input work graph;
- search for loops in the graph;
- if there are loops, parser breaks them;
- construct work graph.
- read input work graph (file in .csv format);
- preprocess received input work graph;
- search for loops in the graph;
- if there are loops, parser breaks them;
- construct work graph.
… feature/parsing_input_data

# Conflicts:
#	sampo/scheduler/multi_agency/multi_agency.py
…s is explained by failed tests with caching 'session' fixtures
…s is explained by failed tests with caching 'session' fixtures
…ng input data: contractor can be build from .csv file not only work graph.
… feature/parsing_input_data

# Conflicts:
#	tests/parser/csv_parser_test.py
…_data

# Conflicts:
#	pyproject.toml
#	sampo/scheduler/genetic/base.py
#	sampo/scheduler/genetic/operators.py
#	sampo/schemas/schedule_spec.py
#	tests/parser/csv_parser_test.py
…ng input data: contractor can be built from .csv file not only work graph.
…ng input data: contractor can be built from .csv file not only work graph.
…_data

# Conflicts:
#	pyproject.toml
#	sampo/schemas/time_estimator.py
#	sampo/userinput/parser/csv_parser.py
#	sampo/userinput/parser/general_build.py
#	sampo/userinput/parser/history.py
#	tests/parser/csv_parser_test.py
@vanoha vanoha added the enhancement New feature or request label Aug 22, 2023
@vanoha vanoha closed this Aug 22, 2023
@vanoha vanoha reopened this Aug 22, 2023
Copy link
Collaborator

@StannisMod StannisMod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes requested

sampo/userinput/parser/csv_parser.py Outdated Show resolved Hide resolved
sampo/userinput/parser/csv_parser.py Outdated Show resolved Hide resolved
sampo/userinput/parser/csv_parser.py Outdated Show resolved Hide resolved
sampo/userinput/parser/general_build.py Show resolved Hide resolved
sampo/userinput/parser/general_build.py Outdated Show resolved Hide resolved
sampo/userinput/parser/history.py Outdated Show resolved Hide resolved
sampo/userinput/parser/history.py Outdated Show resolved Hide resolved
sampo/userinput/parser/history.py Outdated Show resolved Hide resolved
sampo/userinput/parser/history.py Show resolved Hide resolved
tests/parser/csv_parser_test.py Outdated Show resolved Hide resolved
@vanoha vanoha closed this Aug 23, 2023
@vanoha vanoha reopened this Aug 23, 2023
@StannisMod StannisMod self-requested a review August 23, 2023 08:06
Copy link
Collaborator

@StannisMod StannisMod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requested some cosmetic changes

sampo/userinput/parser/general_build.py Outdated Show resolved Hide resolved
sampo/userinput/parser/general_build.py Show resolved Hide resolved
…ine. Generated work graph and history data for testing.
@vanoha vanoha closed this Aug 24, 2023
@vanoha vanoha reopened this Aug 24, 2023
@vanoha vanoha requested a review from StannisMod August 24, 2023 08:34
@vanoha vanoha closed this Aug 24, 2023
@vanoha vanoha reopened this Aug 24, 2023
@vanoha vanoha closed this Aug 24, 2023
@vanoha vanoha reopened this Aug 24, 2023
Copy link
Collaborator

@StannisMod StannisMod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@vanoha vanoha merged commit b4abf4d into main Aug 24, 2023
1 check passed
@StannisMod StannisMod deleted the feature/parsing_input_data branch January 23, 2024 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants