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

Re #9063 Refactoring, fixing bugs

Re #8597 Implementation of AbstractClassificationPredictor, SdcaMEClassifier

Re #9049 thread-safety implementation

Merge branch 'develop' into 'ParserEditsII'

1. Conflicts:
2. Server/ServerApp/Program.cs
3. Server/ServerApp/Properties/launchSettings.json

Merge branch 'Edits_Testing_E' into 'develop'

Edits testing e

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

Re #9049 Implemented Rollback method

Re #9050. Added tests for admin commands parsing.

re #9037 Empty input testing

re #9036 Edits to be able to survive wrong inputs

Refs #9051, #9050. Added more tests + fixed some bugs revealed by the tests.

Re #9049 Implementation of GetDataFileNames and Load methods

Re #9051. Prepared for testing.

Re #9056 refactoring

Re #8593 updated default prediction config

re #9037 Fixing json parser tests to work w/ IDataDownloader

Re #9007. Added weather prediction website to the config file + modified method for weather predictoin download.

Updating develop branch

Re #9034 fixing files corrupted by merge

Merge branch 'develop'

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

Refs #9008, #8919. Data directory path should now be ok on linux + added interface for DataDownloader + changed time span of default downloaded data.

Merge branch 'develop' into 'DataDownloaderTesting_ConnectionFixes'

1. Conflicts:
2. Server/ServerApp/Properties/launchSettings.json

Modified XML deserialization + commands acceptor

Re #8953 tests

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

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

Merge branch 'develop' into 'ParserTestingIII'

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

Push before merge

Re #9009 fix https listener issue

re #8962 Fixing bugs in JsonParser.EncompassSunriseSetTimes

Re #9009 Migrate to .NET 5.0

Re #8953 Adapt to changes from lower layer

Merge branch 'develop' into 'PredictorAPI'

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

Revert "Merge branch 'PredictorAPI' into 'master'"

This reverts merge request !20

re #8962 Adding reading of file to string to CsvDataLoader

re #8934 Creating unit tests for json parser

Merge branch 'develop' into 'MultiClientConnection_ModelIntegration'

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

Re #8941. Responses to GET requests.

Re #8953 refactoring

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.

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

Re #8832 Label creation

Merge branch 'master' into predictor

re #8847 Fixing conflicts in merge

Merge branch 'master' into 'ServerChanges'

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

Re #8832 integration

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

Merge branch 'predictor' into 'TestingParser'

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

Re #8836. Added XML protocol building / parsing.

re #8842 Fixing MergeAttendance

re #8842 Start testing

Re #8832 PredictionController implementation

Merge branch 'NBC' into 'master'

Re #8832 Refactoring

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

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

re 8683 Fix merge errors

Merge branch 'master' into 'DataHandlerChanges'

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

Re #8770. Refactoring

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

Re #8691. Implemented downloaded data retrieving.

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

re #8683 clean after merge

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 'master' into 'ServerParsing'

1. Conflicts:
2. Server/ServerApp.sln
3. Server/ServerApp/Parser/InputData/CsvDataLoader.cs
4. Server/ServerApp/Parser/InputData/JisInstance.cs
5. Server/ServerApp/Parser/InputData/LogInInstance.cs
6. Server/ServerApp/Parser/InputData/WeatherInstance.cs...

re #8598

Update Server/ServerApp/ServerApp.csproj
fixed corrupted dependencies
working simple classification

Refs #8620, #8619. Refactor + testing.

re #8612 Weather parser in hourly intervals

Draft Predictor

re #8598 @2h

Add packages.config, add Predictors

Stub model component

re #8610 Fixing mistakes in start times

Git maintenance