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

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

This reverts merge request !20

Re #8953 refactoring

Re #8953 Implement prediction

Re #8955 implemented multiple predictors support

Re #8955 refactoring

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

Delete .suo

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

re #8611 Login parser for interval lengths

re #8610 Parsing in stable intervals

re #8610 Parsing in intervals dependand on data

Re #8619. Connection handling improvements + simple parser of sent messages.

Re #8619. Simple server and client capable of sending and receiving data.

re #8597 Code maintenance - comments, namespace changes

Re #8620. Data files downloading implemented and plainly tested.

Simple parser - agregates data on "day" granuality

Simple parser - missing comments, code needed asap - minor edit in code

Simple parser - missing comments, code needed asap

Rename

Parse data as days - averages, sums

Parser structure 1.0