ASWI - Pokročilé softwarové inženýrství » ASWI 2021 » OpenData vlastní téma (KIV) - Tři Mušketýři

Modified XML deserialization + commands acceptor

Merge branch 'bugfix-https' into 'develop'

Re #9009 Migrate existing tests

See merge request aswi/aswi-2021/aswi2021tri-musketyri!28

Re #9009 Migrate existing tests

Merge branch 'bugfix-https' into 'develop'

Re #9009 migrate test projects

See merge request aswi/aswi-2021/aswi2021tri-musketyri!27

Re #9009 migrate test projects

Merge branch 'bugfix-https' into 'develop'

Bugfix https

See merge request aswi/aswi-2021/aswi2021tri-musketyri!26

Merge branch 'bugfix-https' of https://gitlab.kiv.zcu.cz/aswi/aswi-2021/aswi2021tri-musketyri into bugfix-https

Re #8943. More debug info added to comminication handling.

Re #9009 Migrate test project

Merge branch 'ParserTestingIII' into 'develop'

Parser testing iii

See merge request aswi/aswi-2021/aswi2021tri-musketyri!25

Merge branch 'develop' into 'ParserTestingIII'

1. Conflicts:
2. Server/ServerApp/Program.cs
3. Server/TestProject/TestProject.csproj

Merge branch 'TextureEditing' into 'develop'

re #8935 Program that can crop textures and outputs cropped versions +...

See merge request aswi/aswi-2021/aswi2021tri-musketyri!24

Push before merge

Re #9009 fix https listener issue

Re #9009 Merge branch 'dotnetMigration' into 'develop'

Dotnet migration

See merge request aswi/aswi-2021/aswi2021tri-musketyri!23

re #8962 Fixing bugs in JsonParser.EncompassSunriseSetTimes

Re #9009 rebase to current changes

Re #9009 Migrate to .NET 5.0

Re #8953 Adapt to changes from lower layer

Merge branch 'PredictorAPI' into 'develop'

Predictor api to develop

See merge request aswi/aswi-2021/aswi2021tri-musketyri!22

Merge branch 'develop' into 'PredictorAPI'

1. Conflicts:
2. Server/ServerApp/Program.cs

re #8962 Adding reading of file to string to CsvDataLoader

re #8934 Creating unit tests for json parser

Re #9009 Migrate to .NET 5.0

Merge branch 'MultiClientConnection_ModelIntegration' into 'develop'

Multi client connection model integration

See merge request aswi/aswi-2021/aswi2021tri-musketyri!19

Merge branch 'develop' into 'MultiClientConnection_ModelIntegration'

1. Conflicts:
2. Server/TestProject/TestProject.csproj

Re #8941. Responses to GET requests.

Re #8953 refactoring

Merge branch 'ParserTestingII' into 'develop'

Parser testing ii

See merge request aswi/aswi-2021/aswi2021tri-musketyri!17

Merge branch 'develop' into 'ParserTestingII'

1. Conflicts:
2. Server/ServerApp/WeatherPredictionParser/IJsonParser.cs
3. Server/ServerApp/WeatherPredictionParser/JsonParser.cs

re #8934 Testing JsonParser

re #8933 Testing LoginParser

re #8933 Testing DataParser, JisParser and WeatherParser

Re #8943. Unsuccesfully trying to run the app on linux; Microsoft.ML complaints.

Re #8953 Implement prediction

Re #8941. Implemented asynchronous listening for clients' requests.

Re #8944. Prepared testing class for DataDownloader.

Re #8942. Implemented data and help commands.

Re #8955 implemented multiple predictors support

Re #8955 refactoring

Re #8942. Started implementing admin commands.

Re #8943. Prepared getting predictions from Model.

Fixed build errors

Re #8943. Untested integration with Model.

Re #8941. Started working on enqueueing requests and processing them in a new thread. + Program.cs cleanup + Fixed Date error.

Merge branch 'ParserEdits' into 'develop'

ParserEdits vol.1

See merge request aswi/aswi-2021/aswi2021tri-musketyri!15

re #8935 Program that can crop textures and outputs cropped versions + coordinates in original + coordinates of centroid in output image

re #8962 Adding filtering method GetPredictionForTime to json parser + adding attributes with file names to DataParser + fixing bug in json parser method Parse

Merge branch 'predictor' into 'master'

Predictor

See merge request aswi/aswi-2021/aswi2021tri-musketyri!14

Re #8832 Label creation

Merge branch 'master' into predictor

re #8847 Fixing conflicts in merge

Merge branch 'UIPrototype' into 'master'

Ui prototype

See merge request aswi/aswi-2021/aswi2021tri-musketyri!13

Merge branch 'ServerChanges' into 'master'

Server changes

See merge request aswi/aswi-2021/aswi2021tri-musketyri!12

Merge branch 'master' into 'ServerChanges'

1. Conflicts:
2. Server/ServerApp/Program.cs

Merge branch 'TestingParser' into 'master'

Testing parser

See merge request aswi/aswi-2021/aswi2021tri-musketyri!11

Re #8829 Added heatmap visualization

Re #8832 integration

Re #8838. Started refining commands accepting + modified GetData in DataDownloader.

Merge branch 'TestingParser' into 'predictor'

Merge TestingParser into predictor

See merge request aswi/aswi-2021/aswi2021tri-musketyri!10

Merge branch 'predictor' into 'TestingParser'

1. Conflicts:
2. Server/ServerApp/Program.cs

Re #8831 Changed deserialization

Re #8836. Added XML protocol building / parsing.

re #8842 Fixing MergeAttendance

re #8842 Start testing

Re #8832 PredictionController implementation

Added communication model and XML serialization

Upload first consistent client demo

Merge branch 'NBC' into 'master'

Re #8832 Refactoring

See merge request aswi/aswi-2021/aswi2021tri-musketyri!9

Merge branch 'JsonParser' into 'master'

Json parser

See merge request aswi/aswi-2021/aswi2021tri-musketyri!8

re #8840 Update commit - start/endTime in method Parse in DataParser can now be null

Re #8836. Fixed errors appearing when client sends POST request by sending an answer to the request.

Re #8832 Refactoring

Refactored existing classes to comply with the coding conventions

re #8841 Fixing errors in start/end time and adding interfaces for DataParser and JsonParser

re #8840 Fixing day changes in list of predictions

re #8840 Finishing up Json parser

re #8840 First test

Merge branch 'UIPrototype' into 'master'

Ui prototype

See merge request aswi/aswi-2021/aswi2021tri-musketyri!7

re 8683 Fix merge errors

Merge branch 'DataHandlerChanges' into 'master'

Data handler changes

See merge request aswi/aswi-2021/aswi2021tri-musketyri!6

Merge branch 'master' into 'DataHandlerChanges'

1. Conflicts:
2. Server/ServerApp/Program.cs

Merge branch 'ServerParsingFix' into 'master'

Server parsing fix

See merge request aswi/aswi-2021/aswi2021tri-musketyri!5

Re #8770. Refactoring

Re #8770. Somewhat working example of HttpListener. Can receive requests from other than host machine. Firawall adjustment was necessary.

Re #8686 Testing a networking solution

Re #8691. Implemented downloaded data retrieving.

Re #8685 Android server connection test

Re #8685 Prototype base

Re #8691. Working on retrieving data in time span from a directory.

re #8682 Modified parser to aggregate data according to buildings. Also added a method that merges information about jis and webauth activity into one list.

Re #8691. Url config improvements + thread for commands accepting prepared.

Re #8691. Big refactor + config file added + working on providing methods for Parser.

re #8682 Changed tags

re #8683 Fixing project dependencies problems

Delete .suo

re #8683 clean after merge

Merge branch 'dataDownload_connection' into 'master'

Data download connection

See merge request aswi/aswi-2021/aswi2021tri-musketyri!4

Merge branch 'master' into 'dataDownload_connection'

1. Conflicts:
2. Server/ServerApp/Program.cs
3. Server/ServerApp/ServerApp.csproj

Merge branch 'NBC' into 'master'

Nbc

See merge request aswi/aswi-2021/aswi2021tri-musketyri!3

Merge branch 'ServerParsing' into 'master'

Server parsing

See merge request aswi/aswi-2021/aswi2021tri-musketyri!2