diff options
Diffstat (limited to 'backend/api')
-rw-r--r-- | backend/api/api/Controllers/DatasetController.cs | 2 | ||||
-rw-r--r-- | backend/api/api/Models/ColumnInfo.cs | 2 | ||||
-rw-r--r-- | backend/api/api/Models/Dataset.cs | 4 | ||||
-rw-r--r-- | backend/api/api/Services/MlConnectionService.cs | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs index 6eb1b9e6..5f01c867 100644 --- a/backend/api/api/Controllers/DatasetController.cs +++ b/backend/api/api/Controllers/DatasetController.cs @@ -148,8 +148,6 @@ namespace api.Controllers /*za pretragu vratiti dataset koji je public public ActionResult<Dataset> Get(string name) { - - var dataset = _datasetService.GetOneDataset(username, name); if (dataset == null) diff --git a/backend/api/api/Models/ColumnInfo.cs b/backend/api/api/Models/ColumnInfo.cs index ee4cee0d..99418732 100644 --- a/backend/api/api/Models/ColumnInfo.cs +++ b/backend/api/api/Models/ColumnInfo.cs @@ -6,6 +6,8 @@ public bool isNumber { get; set; } public int numNulls { get; set; } public float mean { get; set; } + public float min { get; set; } + public float max { get; set; } public float median { get; set; } public string[] uniqueValues { get; set; } diff --git a/backend/api/api/Models/Dataset.cs b/backend/api/api/Models/Dataset.cs index 2b3efa3c..12dcfa08 100644 --- a/backend/api/api/Models/Dataset.cs +++ b/backend/api/api/Models/Dataset.cs @@ -6,6 +6,7 @@ namespace api.Models { public class Dataset { + public Dataset() { } public string username { get; set; } [BsonId] @@ -24,7 +25,8 @@ namespace api.Models public bool hasHeader { get; set; } public ColumnInfo[] columnInfo { get; set; } - public int totalNulls; + public int nullCols { get; set; } + public int nullRows { get; set; } public bool isPreProcess { get; set; } } diff --git a/backend/api/api/Services/MlConnectionService.cs b/backend/api/api/Services/MlConnectionService.cs index 66f7882a..3df22c4f 100644 --- a/backend/api/api/Services/MlConnectionService.cs +++ b/backend/api/api/Services/MlConnectionService.cs @@ -26,12 +26,13 @@ namespace api.Services } public async Task PreProcess(Dataset dataset,string filePath)//(Dataset dataset,byte[] file,string filename) { - var request=new RestRequest("preprocess", Method.Post);//USKLADITI SA ML API + var request=new RestRequest("preprocess", Method.Post); request.AddParameter("dataset", JsonConvert.SerializeObject(dataset)); //request.AddFile("file", file,filename); request.AddFile("file", filePath); request.AddHeader("Content-Type", "multipart/form-data"); var result=await this.client.ExecuteAsync(request); + Dataset newDataset = JsonConvert.DeserializeObject<Dataset>(result.Content); newDataset.isPreProcess = true; _datasetService.Update(newDataset); |