Skip to content

Commit

Permalink
Merge pull request #20 from Cambio-Project/search-data-handling
Browse files Browse the repository at this point in the history 
Search Data Handling
  • Loading branch information
@franksn90
franksn90 authored May 28, 2024
2 parents c48903e + f74c9e7 commit 6a1b71f
Show file tree
Hide file tree
Showing 2 changed files with 209 additions and 190 deletions.
304 changes: 163 additions & 141 deletions ...requirement-optimizer/components/property-edit-dynamic/property-edit-dynamic.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,68 +8,66 @@ import { Dataset } from 'src/app/shared/models/dataset';
import { ValidationResponse } from 'src/app/shared/models/validation-response';

@Component({
selector: 'app-property-edit-dynamic',
templateUrl: './property-edit-dynamic.component.html',
styleUrls: ['./property-edit-dynamic.component.scss']
selector: 'app-property-edit-dynamic',
templateUrl: './property-edit-dynamic.component.html',
styleUrls: ['./property-edit-dynamic.component.scss'],
})
export class PropertyEditDynamicComponent implements OnInit {

@Input() dataset: Dataset | null = null;

psp?: PSP;
pspElements?: PSPElement[];
predicates?: Predicate[];

simId?: string;
responseIndex?: number;

propertyValidationResponse: ValidationResponse | null = null;

constructor(
private route: ActivatedRoute,
private dataSvc: DataService,
private validationSvc: ValidationService,
private dashboardSvc: DashboardService,
) { }

ngOnInit(): void {
this.getParameters();
//this.initHardCodedData();
}

async getParameters() {
this.route.queryParams.subscribe(async params => {
let address = params["file-address"] || "assets/csv";
let filename = params["file"];

this.simId = params["sim_id"];
this.responseIndex = params["response_index"];
this.psp = {
sel: params["sel"],
tbvTimed: params["tbv_timed"],
}
this.predicates = JSON.parse(params["predicates"]).map((predicate: Predicate) => {
return {
...predicate,
predicate_comparison_value: +predicate.predicate_comparison_value!,
}
})

this.pspElements = getPSPElementsFromSEL(this.psp.sel);

if (!!filename == !!this.simId) {
throw new Error("Either provide sim_id or file name, not both or none.")
}
if (this.simId) {
address = `${address}/${this.simId}`
filename = "_combined.csv"
}
this.dataset = await this.dataSvc.parseCsvFileFromAddress(address, filename);
this.validateProperty();
})
}

/* async initHardCodedData() {
@Input() dataset: Dataset | null = null;

psp?: PSP;
pspElements?: PSPElement[];
predicates?: Predicate[];

simId?: string;
responseIndex?: number;

propertyValidationResponse: ValidationResponse | null = null;

constructor(
private route: ActivatedRoute,
private dataSvc: DataService,
private validationSvc: ValidationService,
private dashboardSvc: DashboardService
) {}

ngOnInit(): void {
this.getParameters();
//this.initHardCodedData();
}

async getParameters() {
this.route.queryParams.subscribe(async (params) => {
let address = params['file-address'] || 'assets/csv';
let filename = params['file'];

this.simId = params['sim_id'];
this.responseIndex = params['response_index'];
this.psp = {
sel: params['sel'],
tbvTimed: params['tbv_timed'],
};
this.predicates = JSON.parse(params['predicates']).map(
(predicate: Predicate) => {
return {
...predicate,
predicate_comparison_value:
+predicate.predicate_comparison_value!,
};
}
);

this.pspElements = getPSPElementsFromSEL(this.psp.sel);

this.dataset = await this.dataSvc.parseCsvFileFromAddress(
address,
filename
);
this.validateProperty();
});
}

/* async initHardCodedData() {
// CSV
this.dataset = await this.dataSvc.parseCsvFileFromAddress('assets/csv', 'chaos-exp-1-trace.csv');
Expand Down Expand Up @@ -102,102 +100,126 @@ export class PropertyEditDynamicComponent implements OnInit {
this.validateProperty();
} */

predicatesValid(predicates?: Predicate[]) {
return !predicates?.find(predicate => hasNullOrEmptyProperty(predicate));
}

async validateProperty() {
if (this.dataset && this.psp && this.predicates && this.predicatesValid(this.predicates)) {
this.validationSvc.validatePropertyDynamic(this.dataset, this.psp?.tbvTimed, this.predicates).then(validationResponse => {
this.propertyValidationResponse = validationResponse;
});
}
}

onPredicateChange(predicates: Predicate[]) {
this.validateProperty();
}

onConfirmRefinement() {
if (this.simId == null || this.responseIndex == null || this.predicates == null) return;
this.dashboardSvc.updateScenarioResponse(this.simId, this.responseIndex, this.predicates).subscribe(res => {
console.log(res);
})
}

predicatesValid(predicates?: Predicate[]) {
return !predicates?.find((predicate) =>
hasNullOrEmptyProperty(predicate)
);
}

async validateProperty() {
if (
this.dataset &&
this.psp &&
this.predicates &&
this.predicatesValid(this.predicates)
) {
this.validationSvc
.validatePropertyDynamic(
this.dataset,
this.psp?.tbvTimed,
this.predicates
)
.then((validationResponse) => {
this.propertyValidationResponse = validationResponse;
});
}
}

onPredicateChange(predicates: Predicate[]) {
this.validateProperty();
}

onConfirmRefinement() {
if (
this.simId == null ||
this.responseIndex == null ||
this.predicates == null
)
return;
this.dashboardSvc
.updateScenarioResponse(
this.simId,
this.responseIndex,
this.predicates
)
.subscribe((res) => {
console.log(res);
});
}
}

export interface PSP {
sel: string;
tbvTimed: string;
sel: string;
tbvTimed: string;
}

export interface PSPElement {
predicateName: string | null;
measurementSource: string | null;
specification: string | null;
text: string;
type: 'predicate' | 'text';
predicateName: string | null;
measurementSource: string | null;
specification: string | null;
text: string;
type: 'predicate' | 'text';
}

export interface Predicate {
predicate_name?: string;
predicate_logic?: LogicOperator;
measurement_source?: string;
predicate_comparison_value?: number;
predicate_name?: string;
predicate_logic?: LogicOperator;
measurement_source?: string;
predicate_comparison_value?: number;
}

export const getPSPElementsFromSEL = (sel: string): PSPElement[] => {
const SEL_TO_PSP_REGEX = /(?=\{[^{}]+\}|\[[^\[\]]+\])/g;

const elements = sel.split(SEL_TO_PSP_REGEX)
.map(s => s.trim())
.filter(s => s);

return elements.map(s => {
if (s.charAt(0) === '{') {
const predicateName = extractPredicateName(s);
const measurementSource = extractMeasurementSource(s);
const specification = `${predicateName}(${measurementSource})`;
return {
predicateName,
measurementSource,
specification,
text: s,
type: 'predicate',
}
} else {
return {
predicateName: null,
measurementSource: null,
specification: null,
text: s,
type: 'text',
}
}
});
}
const SEL_TO_PSP_REGEX = /(?=\{[^{}]+\}|\[[^\[\]]+\])/g;

const elements = sel
.split(SEL_TO_PSP_REGEX)
.map((s) => s.trim())
.filter((s) => s);

return elements.map((s) => {
if (s.charAt(0) === '{') {
const predicateName = extractPredicateName(s);
const measurementSource = extractMeasurementSource(s);
const specification = `${predicateName}(${measurementSource})`;
return {
predicateName,
measurementSource,
specification,
text: s,
type: 'predicate',
};
} else {
return {
predicateName: null,
measurementSource: null,
specification: null,
text: s,
type: 'text',
};
}
});
};

const extractPredicateName = (str: string) => {
let regex = /{([A-Za-z0-9]+)\(/;
let match = str.match(regex);
return match ? match[1] : null;
}
let regex = /{([A-Za-z0-9]+)\(/;
let match = str.match(regex);
return match ? match[1] : null;
};

const extractMeasurementSource = (str: string) => {
let regex = /\(([^)]+)\)/;
let match = str.match(regex);
return match ? match[1] : null;
}
let regex = /\(([^)]+)\)/;
let match = str.match(regex);
return match ? match[1] : null;
};

function hasNullOrEmptyProperty(obj: any) {
for (let key in obj) {
if (obj.hasOwnProperty(key)) {
let value = obj[key];
if (value === null || value === undefined || value === '') {
return true;
}
}
}
return false;
}
for (let key in obj) {
if (obj.hasOwnProperty(key)) {
let value = obj[key];
if (value === null || value === undefined || value === '') {
return true;
}
}
}
return false;
}
Loading

0 comments on commit 6a1b71f

Please sign in to comment.