diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index a7a9534..952d4a0 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -43,6 +43,7 @@ type StateType = { sessionId: string; mode: 'bar' | 'cloud'; participantsData: ParticipantData[], + discreteParticipantsData: ParticipantData[], loading: boolean, error: Error | null, paused: boolean, @@ -58,6 +59,7 @@ class App extends React.Component<{}, StateType> { mode: "bar", loading: false, participantsData: [], + discreteParticipantsData: [], error: null, paused: true, showDevSettings: true, @@ -101,15 +103,19 @@ class App extends React.Component<{}, StateType> { this.setState({ loading: true }); try { const participantsData = this.getEmptyParticipantsData(); - for (let pData of participantsData) { - pData.dataContainer = await loadEngagementData( + const discretePartData = this.getEmptyParticipantsData(); + for (let i = 0; i < participantsData.length; i++) { + let engagementData = await loadEngagementData( this.state.username, this.state.password, - pData.dataURL, + participantsData[i].dataURL, false ); + participantsData[i].dataContainer = engagementData[0]; + discretePartData[i].dataContainer = engagementData[1]; } this.setState({ participantsData }); + this.setState({ discreteParticipantsData: discretePartData }); } catch (error) { this.setState({ error }); } finally { @@ -125,8 +131,11 @@ class App extends React.Component<{}, StateType> { renderParticipants = () => { return this.state.participantsData - .map((item, index) => item.dataContainer !== null - ? + item.dataContainer !== null && this.state.discreteParticipantsData[index].dataContainer !== null + ? : null) diff --git a/frontend/src/ExplanationsContainer.tsx b/frontend/src/ExplanationsContainer.tsx index 58de68c..fb5c004 100644 --- a/frontend/src/ExplanationsContainer.tsx +++ b/frontend/src/ExplanationsContainer.tsx @@ -70,6 +70,7 @@ const Unsure = styled.div` function ExplanationsContainer(props: { dataPoint: { input: number[]; output: number[]; explanations: number[][] } | null; + discreteDataPoint: { input: number[]; output: number[]; explanations: number[][] } | null; labels: string[]; maxExplanationValue: number; minInputValues: number[]; @@ -78,13 +79,17 @@ function ExplanationsContainer(props: { username: string; gender: Gender; }) { - const { maxInputValues, minInputValues, maxExplanationValue, dataPoint, username, gender, labels, mode } = props; + const { maxInputValues, minInputValues, maxExplanationValue, dataPoint, discreteDataPoint, username, gender, + labels, mode } = props; if (!dataPoint) return ; + if (!discreteDataPoint) return ; const { input, output, explanations } = dataPoint; const strongestOutputIdx = output.indexOf(Math.max(...output)); + const discreteStrongestOutputIdx = discreteDataPoint.output.indexOf(Math.max(...discreteDataPoint.output)); const confidence = Math.round(output[strongestOutputIdx] * 1000) / 10; const inputNormalized = normalizeInput(input, minInputValues, maxInputValues); + const discreteInputNormalized = normalizeInput(discreteDataPoint.input, minInputValues, maxInputValues); const strongestOutputExplanations = sortAndSelectTopmostFeatures( labels, @@ -95,18 +100,27 @@ function ExplanationsContainer(props: { true ); + const discreteStrongestOutputExplanations = sortAndSelectTopmostFeatures( + labels, + discreteInputNormalized, + discreteDataPoint.explanations[discreteStrongestOutputIdx], + 3, + 0.2, + true + ); + const blur = calculateBlur(confidence); const colorPalette = strongestOutputIdx < 2 ? ENGAGEMENT_NEGATIVE_COLOR_PALETTE : ENGAGEMENT_POSITIVE_COLOR_PALETTE; return ( - + Based on: 0} diff --git a/frontend/src/Participant.tsx b/frontend/src/Participant.tsx index d3a724f..4f28a50 100644 --- a/frontend/src/Participant.tsx +++ b/frontend/src/Participant.tsx @@ -31,6 +31,7 @@ class Participant extends React.Component<{ videoURL: string; name: string; gender: Gender; dataContainer: DataContainerType; + discreteContainer: DataContainerType; mode: "bar" | "cloud"; paused: boolean, volume: number @@ -43,11 +44,12 @@ class Participant extends React.Component<{ }; render() { - const {videoURL, name, dataContainer, mode, volume} = this.props; + const {videoURL, name, dataContainer, discreteContainer, mode, volume} = this.props; const {currentTime} = this.state; const dataPoint = dataContainer?.data[Math.floor(currentTime * dataContainer?.sampleRate)]; + const discreteDataPoint = discreteContainer?.data[Math.floor(currentTime * dataContainer?.sampleRate)]; - const outputClass = dataPoint ? dataPoint.output.indexOf(Math.max(...dataPoint.output)) : 4; + const outputClass = discreteDataPoint ? discreteDataPoint.output.indexOf(Math.max(...discreteDataPoint.output)) : 4; return ( @@ -61,6 +63,7 @@ class Participant extends React.Component<{ {