Skip to content

fix: Incorrect circuit output from combinational analysis (#468) #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

fix: Incorrect circuit output from combinational analysis (#468) #480

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0228bef
Update CombinationalAnalysis.vue
harikrishna-au Feb 14, 2025
76c507e
Update v0/src/components/DialogBox/CombinationalAnalysis.vue
harikrishna-au Feb 14, 2025
986942f
Update v0/src/components/DialogBox/CombinationalAnalysis.vue
harikrishna-au Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 43 additions & 10 deletions v0/src/components/DialogBox/CombinationalAnalysis.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,22 +295,53 @@ function createBooleanPrompt(inputList, outputList, scope = globalScope) {
]
}


function generateBooleanTableData(outputListNames) {
var data = {}
for (var i = 0; i < outputListNames.length; i++) {
data[outputListNames[i]] = {
x: [],
1: [],
0: [],
let data = {};

for (let i = 0; i < outputListNames.length; i++) {
let outputName = outputListNames[i];
data[outputName] = { x: [], 1: [], 0: [] };

let tableDiv = document.querySelector("[data-test-id='combinational-analysis-table']");
if (!tableDiv) {
console.error('Table container not found');
return {};
}
var rows = $(`.${outputListNames[i]}`)
for (let j = 0; j < rows.length; j++) {
data[outputListNames[i]][rows[j].innerHTML].push(rows[j].id)
let table = tableDiv.querySelector("[data-test-id='content-table']");
if (!table) {
console.error('Table not found');
return {};
}
let rows = table.querySelectorAll("tbody tr");

[...rows].forEach((row, index) => {
if (index === 0) return;
let columns = [...row.querySelectorAll("th")];
let lastColumnValue = columns.pop()?.innerText.trim();

if (!lastColumnValue) {
console.error(`Missing value in row ${index}`);
continue;
}

switch(lastColumnValue) {
case '0':
data[outputName]['0'].push(String(index - 1));
break;
case '1':
data[outputName]['1'].push(String(index - 1));
break;
default:
data[outputName]['x'].push(String(index - 1));
}
});
}
return data

return data;
}


function drawCombinationalAnalysis(
combinationalData,
inputList,
Expand Down Expand Up @@ -627,6 +658,7 @@ function solveBooleanFunction(inputListNames, booleanExpression) {
}

function generateCircuit() {

var data = generateBooleanTableData(outputListNamesInteger.value)
var minimizedCircuit = []
let inputCount = inputListNames.value.length
Expand All @@ -649,6 +681,7 @@ function generateCircuit() {
minimizedCircuit.push(temp.result)
}
}

if (output.value == null) {
drawCombinationalAnalysis(
minimizedCircuit,
Expand Down