Value A =
- +Value B =
- +Formulua
- + + +Result
@@ -92,6 +99,33 @@
+
`);
+
+ } else {
+ alert('You have reached a limint of available values');
+ }
+}
+
+let VALUES = new Set();
+let userValues = new Array();
+
+function FetchValues() {
+
+ userValues = new Array();
+
+ for (let i = 0; i < currNumOfValues; i++) {
+
+ let inputField = document.getElementById(`value${i}`);
+ let currCharStr = String.fromCharCode(65 + i);
+
+ if (inputField.value === '1' || inputField.value === 'true' || inputField.value === 'True'|| inputField.value === 'TRUE' || inputField.value === 't' || inputField.value === 'T') {
+ VALUES.add(currCharStr);
+ userValues.push([currCharStr, true]);
+ } else if (inputField.value === '0' || inputField.value === 'false' || inputField.value === 'False' || inputField.value === 'FALSE' || inputField.value === 'f' || inputField.value === 'F') {
+ VALUES.add(currCharStr);
+ userValues.push([currCharStr, false]);
+ }
+ }
+
+ for (const iterator in VALUES) {
+ console.log(iterator, VALUES[iterator]);
+ }
+}
+
+// Evaluate given formula and display the result
+function Evaluate() {
+
+ ToggleAll(false);
+
+ FetchValues();
+
+ let formulaField = document.getElementById('formula');
+
+ let formulaChraArray = formulaField.value.split('');
+ let formulaRPNArray = ConvertToRPNArray(formulaChraArray);
+ let formulaValuesRPNArray = ConvertCharsToValues(formulaRPNArray);
+
+ let result = SolveRPNFormula(formulaValuesRPNArray);
+ if (result == undefined) return;
+ let readableResult = ConvertToReadableResult(result);
+
+ let resultField = document.getElementById('result');
+ resultField.value = readableResult;
+}
+
+//#endregion
+
+//#region Boolean Operations
+
+function Negation(value) {
+
+ if (value != undefined) { return !value; }
+}
+
+function Conjunction(firstValue, secondValue) {
+
+ if (firstValue === true && secondValue === true) {
+ return true;
+ } else if (firstValue === false && secondValue === true || firstValue === true && secondValue === false || firstValue === false && secondValue === false) {
+ return false;
+ }
+}
+
+function Disjunction(firstValue, secondValue) {
+
+ if (firstValue === true || secondValue === true) {
+ return true;
+ } else if (firstValue === false && secondValue === false) {
+ return false;
+ }
+}
+
+function Equivalence(firstValue, secondValue) {
+
+ if (firstValue === secondValue) {
+ return true;
+ } else if (firstValue !== secondValue) {
+ return false;
+ }
+}
+
+//#endregion
+
+//#region Essential Functions
+
+function ConvertToRPNArray(chars) {
+
+ let _values_stack = new Array();
+ let _actions_stack = new Array();
+
+ for (let i = 0; i < chars.length; i++) {
+ const element = chars[i];
+
+ if (!OPERATORS.has(element) && !BRACKETS.has(element)) {
+
+ _values_stack.push(element);
+ } else if (OPERATORS.has(element)) {
+
+ while (GetActionPriority(_actions_stack[_actions_stack.length - 1]) >= GetActionPriority(element)) {
+
+ let last = _actions_stack.pop();
+
+ if (last != '(') {
+ _values_stack.push(last);
+ } else {
+ break;
+ }
+ }
+
+ if (_actions_stack[0] == undefined || GetActionPriority(_actions_stack[_actions_stack.length - 1]) < GetActionPriority(element)) {
+
+ _actions_stack.push(element);
+ }
+ } else if (BRACKETS.has(element)) {
+
+ if (element == '(') {
+
+ _actions_stack.push(element);
+ }
+
+ if (element == ')') {
+
+ let _last = _actions_stack.pop();
+
+ while (_last != '(') {
+
+ _values_stack.push(_last);
+ _last = _actions_stack.pop();
+ }
+ }
+ } else {
+ Error('The programm cant solve given formula. Do you typed everything right? Maybe you forgot to define some value?');
+ }
+ }
+
+ while (_actions_stack[0] != undefined) {
+
+ _values_stack.push(_actions_stack.pop());
+ }
+
+ return _values_stack;
+}
+
+function ConvertCharsToValues(RPNArray) {
+
+ let valuesRNPArray = new Array();
+
+ RPNArray.forEach(element => {
+
+ if (VALUES.has(element)) {
+ valuesRNPArray.push(GetValueFromIndex(element));
+ } else if (element !== '(' || element !== ')') {
+ valuesRNPArray.push(element);
+ }
+ });
+
+ return valuesRNPArray;
+}
+
+function SolveRPNFormula(valuesRPNArray) {
+
+ let stepByStepResults = new Array();
+
+ let _stack = new Array();
+
+ for (let i = 0; i < valuesRPNArray.length; i++) {
+ const element = valuesRPNArray[i];
+
+ if (OPERATORS.has(element)) {
+
+ if (element == '!') {
+
+ let _currValue = _stack.pop();
+
+ let _result = Negation(_currValue);
+
+ _stack.push(_result);
+ stepByStepResults.push(ConvertToReadableResult(_result));
+
+ } else if (element == '*') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = Conjunction(_firstValue, _secondValue);
+
+ _stack.push(_result);
+ stepByStepResults.push(ConvertToReadableResult(_result));
+
+ } else if (element == '+') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = Disjunction(_firstValue, _secondValue);
+
+ _stack.push(_result);
+ stepByStepResults.push(ConvertToReadableResult(_result));
+
+ } else if (element == '>') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = Disjunction(Negation(_firstValue), _secondValue);
+
+ _stack.push(_result);
+ stepByStepResults.push(ConvertToReadableResult(_result));
+
+ } else if (element == '=') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = Equivalence(_firstValue, _secondValue);
+
+ _stack.push(_result);
+ stepByStepResults.push(ConvertToReadableResult(_result));
+
+ }
+ } else {
+
+ _stack.push(element);
+ }
+ }
+
+ return _stack[0];
+}
+
+//#endregion
+
+//#region Step By Step
+
+// Evalutae formula and display steps in the interface
+function StepByStep() {
+
+ FetchValues();
+
+ let formulaField = document.getElementById('formula');
+
+ let formulaChraArray = formulaField.value.split('');
+ let formulaRPNArray = ConvertToRPNArray(formulaChraArray);
+ let formulaValuesRPNArray = ConvertCharsToValues(formulaRPNArray);
+
+ let result = SolveRPNFormula(formulaValuesRPNArray);
+ if (result == undefined) return;
+ let readableResult = ConvertToReadableResult(result);
+
+ let resultField = document.getElementById('result');
+ resultField.value = readableResult;
+
+ let stepsActionsArray = GetCharSteps(formulaRPNArray);
+ let stepsResultsArray = GetStepsResults(formulaValuesRPNArray);
+
+ // console.log(stepsActionsArray);
+ // console.log(stepsResultsArray);
+
+ if (stepsResultsArray.length > 0) {
+
+ ToggleAll(false);
+ ToggleSteps(true);
+
+ for (let i = 0; i < stepsActionsArray.length; i++) {
+ const action = stepsActionsArray[i];
+ const result = stepsResultsArray[i];
+
+
+ stepsWrapper.insertAdjacentHTML('beforeend', ` Value &#${charNum} =
+ +
+
`);
+ }
+ }
+
+ // Get steps in form of characters
+ function GetCharSteps(RPNArray) {
+
+ let stepsArray = new Array();
+
+ let _stack = new Array();
+
+ for (let i = 0; i < RPNArray.length; i++) {
+ const element = RPNArray[i];
+
+ if (OPERATORS.has(element)) {
+
+ if (element == '!') {
+
+ let _currValue = _stack.pop();
+
+ let _result;
+
+ if (_currValue.length <= 2) {
+ _result = '!'.concat(_currValue);
+ } else {
+ _result = '!'.concat('(').concat(_currValue).concat(')');
+ }
+
+ _stack.push(_result);
+ stepsArray.push([_result]);
+
+ } else if (element == '*') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result;
+
+ let _firstHasExclemMark = Boolean(_firstValue.split('').filter(x => x === '!').length);
+ let _secondHasExclemMark = Boolean(_secondValue.split('').filter(x => x === '!').length);
+
+ if (_firstValue.length <= 2 && _secondValue.length <= 2) {
+ _result = _firstValue.concat('*').concat(_secondValue);
+ } else if (_firstValue.length <= 2 && _secondValue.length > 2) {
+
+ if (_secondHasExclemMark) {
+
+ _result = _firstValue.concat('*').concat(_secondValue);
+ } else {
+ _result =
+ _firstValue.concat('*').concat('(').concat(_secondValue).concat(')');
+ }
+ } else if (_firstValue.length > 2 && _secondValue.length <= 2) {
+
+ if (_firstHasExclemMark) {
+
+ _result = _firstValue.concat('*').concat(_secondValue);
+ } else {
+
+ _result = '('.concat(_firstValue).concat(')').concat('*').concat(_secondValue);
+ }
+ } else if (_firstValue.length > 2 && _secondValue.length > 2) {
+
+ if (_firstHasExclemMark && _secondHasExclemMark) {
+
+ _result = _firstValue.concat('*').concat(_secondValue);
+ } if (_firstHasExclemMark && !_secondHasExclemMark) {
+
+ _result = _firstValue.concat('*').concat('(').concat(_secondValue).concat(')');
+ } else if (!_firstHasExclemMark && _secondHasExclemMark) {
+
+ _result = '('.concat(_firstValue).concat(')').concat('*').concat(_secondValue);;
+ } else {
+
+ _result = '('.concat(_firstValue).concat(')').concat('*').concat('(').concat(_secondValue).concat(')');
+ }
+ }
+
+ _stack.push(_result);
+ stepsArray.push([_result]);
+
+ } else if (element == '+') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = _firstValue.concat('+').concat(_secondValue);
+
+ _stack.push(_result);
+ stepsArray.push([_result]);
+
+ } else if (element == '>') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = _firstValue.concat('>').concat(_secondValue);
+
+ _stack.push(_result);
+ stepsArray.push([_result]);
+
+ } else if (element == '=') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = _firstValue.concat('=').concat(_secondValue);
+
+ _stack.push(_result);
+ stepsArray.push([_result]);
+ }
+ } else {
+
+ _stack.push(element);
+ }
+ }
+
+ return stepsArray;
+ // return _stack[0];
+ }
+
+ // Get a result of each step
+ function GetStepsResults(valuesRPNArray) {
+
+ let stepByStepResults = new Array();
+
+ let _stack = new Array();
+
+ for (let i = 0; i < valuesRPNArray.length; i++) {
+ const element = valuesRPNArray[i];
+
+ if (OPERATORS.has(element)) {
+
+ if (element == '!') {
+
+ let _currValue = _stack.pop();
+
+ let _result = Negation(_currValue);
+
+ _stack.push(_result);
+ stepByStepResults.push(ConvertToReadableResult(_result));
+
+ } else if (element == '*') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = Conjunction(_firstValue, _secondValue);
+
+ _stack.push(_result);
+ stepByStepResults.push(ConvertToReadableResult(_result));
+
+ } else if (element == '+') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = Disjunction(_firstValue, _secondValue);
+
+ _stack.push(_result);
+ stepByStepResults.push(ConvertToReadableResult(_result));
+
+ } else if (element == '>') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = Disjunction(Negation(_firstValue), _secondValue);
+
+ _stack.push(_result);
+ stepByStepResults.push(ConvertToReadableResult(_result));
+
+ } else if (element == '=') {
+
+ let _secondValue = _stack.pop();
+ let _firstValue = _stack.pop();
+
+ let _result = Equivalence(_firstValue, _secondValue);
+
+ _stack.push(_result);
+ stepByStepResults.push(ConvertToReadableResult(_result));
+
+ }
+ } else {
+
+ _stack.push(element);
+ }
+ }
+
+ return stepByStepResults;
+ }
+}
+
+//#endregion
+
+//#region Truth Table
+
+// Generate truth table and display it in the interface
+function BuildTruthTable() {
+
+ let header = document.getElementById('formula').value.match(/[A-Z]/g);
+ let matrix = GenerateTruthTable();
+ DisplayTruthTable(matrix, header);
+}
+
+// Generate truth table
+function GenerateTruthTable() {
+
+ let formulaField = document.getElementById('formula');
+
+ let numColumns = formulaField.value.match(/[A-Z]/g).length;
+ let numRows = Math.pow(2, numColumns);
+
+ // Initializing the truthTable
+ let truthTable = new Array();
+
+ for (let i = 0; i < numRows; i++) {
+ truthTable.push(new Array(numColumns + 1));
+ }
+
+ for (let c = 0; c < numColumns; c++) {
+
+ let period = Math.pow(2, numColumns) / Math.pow(2, c+1);
+ let zeros = true;
+
+ for (let r = 0; r < numRows; r++) {
+
+ if (zeros) {
+ truthTable[r][c] = false;
+ }
+
+ if (!zeros) {
+ truthTable[r][c] = true;
+ }
+
+ if ((r+1) % period == 0) {
+ zeros = !zeros;
+ }
+ }
+ }
+
+ //Evaluate the result for each row
+ for (let r = 0; r < truthTable.length; r++) {
+ truthTable[r][numColumns] = SolveRPNFormula(ConvertToRPNArray(formulaField.value.split('').map(x => x = ConvertCharsToValues(x, r))));
+ }
+
+ //Additional functions
+ function ConvertCharsToValues(index, row) {
+ return formulaField.value.match(/[A-Z]/g).indexOf(index) != -1 ? truthTable[row][formulaField.value.match(/[A-Z]/g).indexOf(index)] : index;
+ }
+
+ return truthTable;
+}
+
+// Display truth table in the interface
+function DisplayTruthTable(matrix, header) {
+
+ //Display the truth table in the interface
+ ToggleAll(false);
+ ToggleTruthTable(true);
+
+ let truthTableWrapper = document.querySelector('#truthTableWrapper');
+
+ truthTableWrapper.insertAdjacentHTML('beforeend', ` ${i+1}.
+ +
+
+
+
`);
+
+ for (let r = 0; r < matrix.length; r++) {
+
+ let result = matrix[r].pop();
+
+ truthTableWrapper.insertAdjacentHTML('beforeend', `
+
+
+
`);
+ }
+}
+
+//#endregion
+
+//#region PDNF & PCNF
+
+function BuildPDNF() {
+
+ DisplayPDNF(GeneratePDNF());
+}
+
+function GeneratePDNF() {
+
+ let pdnf = '';
+ let mintermCount = 0;
+
+ let header = document.getElementById('formula').value.match(/[A-Z]/g);
+ let matrix = GenerateTruthTable();
+
+ for (let r = 0; r < matrix.length; r++) {
+ if (matrix[r][matrix[r].length - 1] == 1) {
+
+ pdnf += mintermCount != 0 ? '+(' : '(';
+
+ for (let c = 0; c < matrix[r].length - 1; c++) {
+ pdnf += matrix[r][c] == 0 ? '!' + header[c] : header[c];
+ pdnf += c != matrix[r].length - 2 ? '*' : '';
+ }
+
+ pdnf += ')';
+ mintermCount++;
+ }
+ }
+
+ return pdnf;
+}
+
+function DisplayPDNF(pdnf) {
+
+ ToggleAll(false);
+ TogglePDNF(true);
+
+ let Wrapper = document.querySelector('#pdnfWrapper');
+
+ Wrapper.insertAdjacentHTML('beforeend', `
+
+
+
`);
+}
+
+
+function BuildPCNF() {
+
+ DisplayPCNF(GeneratePCNF());
+}
+
+function GeneratePCNF() {
+
+ let pcnf = '';
+ let maxtermCount = 0;
+
+ let header = document.getElementById('formula').value.match(/[A-Z]/g);
+ let matrix = GenerateTruthTable();
+
+ for (let r = 0; r < matrix.length; r++) {
+ if (matrix[r][matrix[r].length - 1] == 0) {
+
+ pcnf += maxtermCount != 0 ? '*(' : '(';
+
+ for (let c = 0; c < matrix[r].length - 1; c++) {
+ pcnf += matrix[r][c] == 1 ? '!' + header[c] : header[c];
+ pcnf += c != matrix[r].length - 2 ? '+' : '';
+ }
+
+ pcnf += ')';
+ maxtermCount++;
+ }
+ }
+
+ return pcnf;
+}
+
+function DisplayPCNF(pcnf) {
+
+ ToggleAll(false);
+ TogglePCNF(true);
+
+ let Wrapper = document.querySelector('#pcnfWrapper');
+
+ Wrapper.insertAdjacentHTML('beforeend', `
+
+
+
`);
+}
+//#endregion
+
+//#region Additional Functions (Essential too)
+
+function ToggleSteps(show) {
+
+ let Node = document.querySelector('#stepsNode');
+ let Wrapper = document.querySelector('#stepsWrapper');
+
+ if (show) {
+ Node.classList.remove('hide');
+ Wrapper.querySelectorAll('#input-wrap').forEach((element) => {
+ element.remove();
+ });
+ } else {
+ Node.classList.add('hide');
+ }
+}
+
+function ToggleTruthTable(show) {
+
+ let Node = document.querySelector('#truthTableNode');
+ let Wrapper = document.querySelector('#truthTableWrapper');
+
+ if (show) {
+ Node.classList.remove('hide');
+ Wrapper.querySelectorAll('#input-wrap').forEach((element) => {
+ element.remove();
+ });
+ } else {
+ Node.classList.add('hide');
+ }
+}
+
+function TogglePDNF(show) {
+
+ let Node = document.querySelector('#pdnfNode');
+ let Wrapper = document.querySelector('#pdnfWrapper');
+
+ if (show) {
+ Node.classList.remove('hide');
+ Wrapper.querySelectorAll('#input-wrap').forEach((element) => {
+ element.remove();
+ });
+ } else {
+ Node.classList.add('hide');
+ }
+}
+
+function TogglePCNF(show) {
+
+ let Node = document.querySelector('#pcnfNode');
+ let Wrapper = document.querySelector('#pcnfWrapper');
+
+ if (show) {
+ Node.classList.remove('hide');
+ Wrapper.querySelectorAll('#input-wrap').forEach((element) => {
+ element.remove();
+ });
+ } else {
+ Node.classList.add('hide');
+ }
+}
+
+function ToggleAll(show) {
+ ToggleSteps(show);
+ ToggleTruthTable(show);
+ TogglePDNF(show);
+ TogglePCNF(show);
+}
+
+const OPERATORS = new Set(['!', '*', '+', '>', '=']);
+const BRACKETS = new Set(['(', ')']);
+
+function GetActionPriority(action) {
+
+ if (action == '!') {
+ return 5;
+ } else if (action == '*') {
+ return 4;
+ } else if (action == '+' || action == '>' || action == '=') {
+ return 3;
+ } else if (action == '(') {
+ return 2;
+ } else {
+ return 0;
+ }
+}
+
+function GetValueFromIndex(valueIndex) {
+
+ for (let i = 0; i < userValues.length; i++) {
+ const element = userValues[i];
+
+ if (element[0] == valueIndex) {
+ return element[1];
+ }
+ }
+}
+
+function ConvertToReadableResult(unconverted) {
+
+ return unconverted === true ? '1' : '0';
+}
+
+function Error(errMsg) {
+ console.log(` [ERROR] ${errMsg}`);
+}
+
+//#endregion
+
+//#region Check Input
+
+const symbols = ['0', '1'];
+const specialSymbols = ['Backspace', 'ArrowLeft', 'ArrowRight', 'Delete'];
+
+function checkInputValue(key, value) {
+ if (value.length < 1 && symbols.indexOf(key) !== -1) {
+ return true;
+ } else if (value.length == 1 && specialSymbols.indexOf(key) !== -1) {
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
+const symbols2 = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K',
+ 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
+ 'W', 'X', 'Y', 'Z', 'Backspace', 'ArrowLeft', 'ArrowRight', 'Delete',
+ '>', '=', '+', '*', '!', '(', ')'
+];
+
+function checkInputProblem(key) {
+ return (symbols2.indexOf(key) != -1) ? true : false;
+}
+
+//#endregion
\ No newline at end of file
diff --git a/Lab-2/script.js b/Lab-2/script.js
deleted file mode 100644
index 94f6bdb..0000000
--- a/Lab-2/script.js
+++ /dev/null
@@ -1,570 +0,0 @@
-let maxNumOfValues = 26;
-let currNumOfValues = 2;
-
-function AddValue() {
-
- if (currNumOfValues < 26) {
-
- let charNum = 65 + currNumOfValues;
- currNumOfValues++;
-
- let delBtn = document.querySelectorAll('#delBtn');
- if (delBtn[delBtn.length - 1]) {
- delBtn[delBtn.length - 1].style="display: none;";
- }
-
- node = document.getElementById('values');
- node.insertAdjacentHTML('beforeend', `
-
`);
-
- } else {
- alert('You have reached a limint of available values');
- }
-}
-
-function DeleteValue(valNum) {
-
- let valueField = document.querySelector(`#valueField${valNum}`);
- valueField.remove();
- currNumOfValues--;
-
- let delBtn = document.querySelectorAll('#delBtn');
- if (delBtn[delBtn.length - 1]) {
- delBtn[delBtn.length - 1].style="display: inline-block;";
- }
-}
-
-
-let VALUES = new Set();
-let userValues = new Array();
-
-function FetchValues() {
-
- userValues = new Array();
-
- for (let i = 0; i < currNumOfValues; i++) {
-
- let inputField = document.getElementById(`value${i}`);
- let currCharStr = String.fromCharCode(65 + i);
-
- if (inputField.value === '1' || inputField.value === 'true' || inputField.value === 'True'|| inputField.value === 'TRUE' || inputField.value === 't' || inputField.value === 'T') {
- VALUES.add(currCharStr);
- userValues.push([currCharStr, true]);
- } else if (inputField.value === '0' || inputField.value === 'false' || inputField.value === 'False' || inputField.value === 'FALSE' || inputField.value === 'f' || inputField.value === 'F') {
- VALUES.add(currCharStr);
- userValues.push([currCharStr, false]);
- }
- }
-
- for (const iterator in VALUES) {
- console.log(iterator, VALUES[iterator]);
- }
-}
-
-let stepByStep = false;
-
-function Evaluate() {
-
- FetchValues();
-
- let formulaField = document.getElementById('formula');
-
- let formulaChraArray = formulaField.value.split('');
- let formulaRPNArray = ConvertCharArrayToRPNArray(formulaChraArray);
- let formulaValuesRPNArray = ConvertLettersToValues(formulaRPNArray);
-
- let result = SolveRPNFormula(formulaValuesRPNArray);
- let readableResult = convertToReadableResult(result[0]);
-
- let resultField = document.getElementById('result');
- resultField.value = readableResult;
-
-
- let stepsNode = document.querySelector('#stepsNode');
- let stepsWrapper = document.querySelector('#stepsWrapper');
-
- stepsNode.classList.add('hide');
- stepsWrapper.querySelectorAll('#input-wrap').forEach((element) => {
- element.remove();
- });
-
- if (stepByStep) {
-
- stepsNode.classList.remove('hide');
-
- let stepsActionsArray = StepByStepRPNFormula(formulaRPNArray);
- let stepsResultsArray = result[1];
-
-
- for (let i = 0; i < stepsActionsArray.length; i++) {
- const action = stepsActionsArray[i];
- const result = stepsResultsArray[i];
-
- stepsWrapper.insertAdjacentHTML('beforeend', ` Value &#${charNum} =
- -
-
`);
- }
-
- stepByStep = false;
- }
-}
-
-function StepByStep() {
-
- stepByStep = true;
- Evaluate();
-}
-
-
-function Negation(value) {
-
- if (value != undefined) { return !value; }
-}
-
-function Conjunction(firstValue, secondValue) {
-
- if (firstValue === true && secondValue === true) {
- return true;
- } else if (firstValue === false && secondValue === true || firstValue === true && secondValue === false || firstValue === false && secondValue === false) {
- return false;
- }
-}
-
-function Disjunction(firstValue, secondValue) {
-
- if (firstValue === true || secondValue === true) {
- return true;
- } else if (firstValue === false && secondValue === false) {
- return false;
- }
-}
-
-function Equivalence(firstValue, secondValue) {
-
- if (firstValue === secondValue) {
- return true;
- } else if (firstValue !== secondValue) {
- return false;
- }
-}
-
-
-
-
-
-
-function ConvertCharArrayToRPNArray(chars) {
-
- let _values_stack = new Array();
- let _actions_stack = new Array();
-
- for (let i = 0; i < chars.length; i++) {
- const element = chars[i];
-
- if (VALUES.has(element)) {
-
- _values_stack.push(element);
- } else if (OPERATORS.has(element)) {
-
- while (GetActionPriority(_actions_stack[_actions_stack.length - 1]) >= GetActionPriority(element)) {
-
- let last = _actions_stack.pop();
-
- if (last != '(') {
- _values_stack.push(last);
- } else {
- break;
- }
- }
-
- if (_actions_stack[0] == undefined || GetActionPriority(_actions_stack[_actions_stack.length - 1]) < GetActionPriority(element)) {
-
- _actions_stack.push(element);
- }
- } else if (BRACKETS.has(element)) {
-
- if (element == '(') {
-
- _actions_stack.push(element);
- }
-
- if (element == ')') {
-
- let _last = _actions_stack.pop();
-
- while (_last != '(') {
-
- _values_stack.push(_last);
- _last = _actions_stack.pop();
- }
- }
- } else {
- Error('The programm cant solve given formula. Do you typed everything right? Maybe you forgot to define some value?');
- }
- }
-
- while (_actions_stack[0] != undefined) {
-
- _values_stack.push(_actions_stack.pop());
- }
-
- return _values_stack;
-}
-
-function ConvertLettersToValues(RPNArray) {
-
- let valuesRNPArray = new Array();
-
- RPNArray.forEach(element => {
-
- if (VALUES.has(element)) {
- valuesRNPArray.push(GetValueFromIndex(element));
- } else if (element !== '(' || element !== ')') {
- valuesRNPArray.push(element);
- }
- });
-
- return valuesRNPArray;
-}
-
-function SolveRPNFormula(valuesRPNArray) {
-
- let stepByStepResults = new Array();
-
- let _stack = new Array();
-
- for (let i = 0; i < valuesRPNArray.length; i++) {
- const element = valuesRPNArray[i];
-
- if (OPERATORS.has(element)) {
-
- if (element == '!') {
-
- let _currValue = _stack.pop();
-
- let _result = Negation(_currValue);
-
- _stack.push(_result);
- stepByStepResults.push(convertToReadableResult(_result));
-
- } else if (element == '*') {
-
- let _secondValue = _stack.pop();
- let _firstValue = _stack.pop();
-
- let _result = Conjunction(_firstValue, _secondValue);
-
- _stack.push(_result);
- stepByStepResults.push(convertToReadableResult(_result));
-
- } else if (element == '+') {
-
- let _secondValue = _stack.pop();
- let _firstValue = _stack.pop();
-
- let _result = Disjunction(_firstValue, _secondValue);
-
- _stack.push(_result);
- stepByStepResults.push(convertToReadableResult(_result));
-
- } else if (element == '>') {
-
- let _secondValue = _stack.pop();
- let _firstValue = _stack.pop();
-
- let _result = Disjunction(Negation(_firstValue), _secondValue);
-
- _stack.push(_result);
- stepByStepResults.push(convertToReadableResult(_result));
-
- } else if (element == '=') {
-
- let _secondValue = _stack.pop();
- let _firstValue = _stack.pop();
-
- let _result = Equivalence(_firstValue, _secondValue);
-
- _stack.push(_result);
- stepByStepResults.push(convertToReadableResult(_result));
-
- }
- } else {
-
- _stack.push(element);
- }
- }
-
- return [_stack[0], stepByStepResults];
-}
-
-function StepByStepRPNFormula(RPNArray) {
-
- let stepsArray = new Array();
-
- let _stack = new Array();
-
- for (let i = 0; i < RPNArray.length; i++) {
- const element = RPNArray[i];
-
- if (OPERATORS.has(element)) {
-
- if (element == '!') {
-
- let _currValue = _stack.pop();
-
- let _result;
-
- if (_currValue.length <= 2) {
- _result = '!'.concat(_currValue);
- } else {
- _result = '!'.concat('(').concat(_currValue).concat(')');
- }
-
- _stack.push(_result);
- stepsArray.push([_result]);
-
- } else if (element == '*') {
-
- let _secondValue = _stack.pop();
- let _firstValue = _stack.pop();
-
- let _result;
-
- let _firstHasExclemMark = Boolean(_firstValue.split('').filter(x => x === '!').length);
- let _secondHasExclemMark = Boolean(_secondValue.split('').filter(x => x === '!').length);
-
- if (_firstValue.length <= 2 && _secondValue.length <= 2) {
- _result = _firstValue.concat('*').concat(_secondValue);
- } else if (_firstValue.length <= 2 && _secondValue.length > 2) {
-
- if (_secondHasExclemMark) {
-
- _result = _firstValue.concat('*').concat(_secondValue);
- } else {
- _result =
- _firstValue.concat('*').concat('(').concat(_secondValue).concat(')');
- }
- } else if (_firstValue.length > 2 && _secondValue.length <= 2) {
-
- if (_firstHasExclemMark) {
-
- _result = _firstValue.concat('*').concat(_secondValue);
- } else {
-
- _result = '('.concat(_firstValue).concat(')').concat('*').concat(_secondValue);
- }
- } else if (_firstValue.length > 2 && _secondValue.length > 2) {
-
- if (_firstHasExclemMark && _secondHasExclemMark) {
-
- _result = _firstValue.concat('*').concat(_secondValue);
- } if (_firstHasExclemMark && !_secondHasExclemMark) {
-
- _result = _firstValue.concat('*').concat('(').concat(_secondValue).concat(')');
- } else if (!_firstHasExclemMark && _secondHasExclemMark) {
-
- _result = '('.concat(_firstValue).concat(')').concat('*').concat(_secondValue);;
- } else {
-
- _result = '('.concat(_firstValue).concat(')').concat('*').concat('(').concat(_secondValue).concat(')');
- }
- }
-
- _stack.push(_result);
- stepsArray.push([_result]);
-
- } else if (element == '+') {
-
- let _secondValue = _stack.pop();
- let _firstValue = _stack.pop();
-
- let _result = _firstValue.concat('+').concat(_secondValue);
-
- _stack.push(_result);
- stepsArray.push([_result]);
-
- } else if (element == '>') {
-
- let _secondValue = _stack.pop();
- let _firstValue = _stack.pop();
-
- let _result = _firstValue.concat('>').concat(_secondValue);
-
- _stack.push(_result);
- stepsArray.push([_result]);
-
- } else if (element == '=') {
-
- let _secondValue = _stack.pop();
- let _firstValue = _stack.pop();
-
- let _result = _firstValue.concat('=').concat(_secondValue);
-
- _stack.push(_result);
- stepsArray.push([_result]);
- }
- } else {
-
- _stack.push(element);
- }
- }
-
- return stepsArray;
- // return _stack[0];
-}
-
-
-
-
-
-function InputFormulaFotTruthTable() {
-
-
- let _formulaString = prompt('>>> ');
-
-
- if (_formulaString.search('[!,*,+,>,=]') == -1) {
- Error('The programm cant solve given formula. Do you typed everything right?');
- }
-
-
- if (_formulaString.match(/[a-z]/g) != null) {
-
- _formulaString.match(/[a-z]/g).forEach (element => {
- TTVALUESNAMES.add(element);
- })
- } else {
- Error('The programm cant solve given formula. Do you typed everything right?');
- }
-
- TTVALUESNAMES.forEach(element => {
- TTVALUESCONTENTS.push([element]);
- })
-
-
- let _numColumns = TTVALUESNAMES.size;
-
- let _numRows = Math.pow(2, _numColumns);
-
-
-
- let _rowsContent = new Array();
-
- for (let r = 0; r < _numRows; r++) {
-
- _rowsContent.push(new Array());
-
- for (let c = 0; c < _numColumns; c++) {
-
- _rowsContent[r].push(false);
- }
- }
-
-
- for (let c = 0; c < _numColumns; c++) {
-
- let _period = Math.pow(2, _numColumns) / Math.pow(2, c+1);
-
- let _zeros = true;
-
- for (let r = 0; r < _numRows; r++) {
-
- if (_zeros) {
- _rowsContent[r][c] = false;
- TTVALUESCONTENTS[c].push(false);
- }
-
- if (!_zeros) {
- _rowsContent[r][c] = true;
- TTVALUESCONTENTS[c].push(true);
- }
-
- if ((r + 1) % _period == 0) {
- _zeros = !_zeros;
- }
- }
- }
-
- // console.log(_rowsContent);
- // console.log(TTVALUESCONTENTS);
-
-
-
- let _formulaCharArray = ConvertFormulaToCharArray(_formulaString);
-
- let _result = new Array();
-
- for (let i = 0; i < _numRows; i++) {
-
- let _formula_RPN_Array = ConvertCharArrayToRPNArray(_formulaCharArray, i + 1);
- _result.push(SolveRPNFormula(_formula_RPN_Array));
- }
- // console.log(_result);
- _result.forEach(element => {
-
- if (element == undefined) {
- Error('The programm cant solve given formula. Do you typed everything right?');
- }
- });
-
- ttformula = _formulaString;
- numRows = _numRows;
- rowsContent = _rowsContent;
- truthTable = _result;
-
-
- console.log('');
- for (let r = 0; r < _numRows; r++) {
-
- console.log(` ${_rowsContent[r].join(', ')} : ${_result[r]}`);
- }
- console.log('');
-
- ClearTruthTableData();
-
- ReturnToMenu();
-}
-
-
-
-
-const OPERATORS = new Set(['!', '*', '+', '>', '=']);
-const BRACKETS = new Set(['(', ')']);
-
-function GetActionPriority(action) {
-
- if (action == '!') {
- return 5;
- } else if (action == '*') {
- return 4;
- } else if (action == '+' || action == '>' || action == '=') {
- return 3;
- } else if (action == '(') {
- return 2;
- } else {
- return 0;
- }
-}
-
-function GetValueFromIndex(valueIndex) {
-
- for (let i = 0; i < userValues.length; i++) {
- const element = userValues[i];
-
- if (element[0] == valueIndex) {
- return element[1];
- }
- }
-}
-
-function convertToReadableResult(unconverted) {
-
- return unconverted === true ? '1' : '0';
-}
-
-function Error(errMsg) {
- console.log(` [ERROR] ${errMsg}`);
-}
\ No newline at end of file
diff --git a/Set-Algebra/Complement.png b/Set-Algebra/Complement.png
new file mode 100644
index 0000000..987eced
Binary files /dev/null and b/Set-Algebra/Complement.png differ
diff --git a/Set-Algebra/Intersection.png b/Set-Algebra/Intersection.png
new file mode 100644
index 0000000..1922d43
Binary files /dev/null and b/Set-Algebra/Intersection.png differ
diff --git a/Set-Algebra/Substraction.png b/Set-Algebra/Substraction.png
new file mode 100644
index 0000000..0c45419
Binary files /dev/null and b/Set-Algebra/Substraction.png differ
diff --git a/Set-Algebra/Union.png b/Set-Algebra/Union.png
new file mode 100644
index 0000000..37c375e
Binary files /dev/null and b/Set-Algebra/Union.png differ
diff --git a/Set-Algebra/favicon.png b/Set-Algebra/favicon.png
new file mode 100644
index 0000000..fd653ee
Binary files /dev/null and b/Set-Algebra/favicon.png differ
diff --git a/Set-Algebra/index.html b/Set-Algebra/index.html
new file mode 100644
index 0000000..2d04086
--- /dev/null
+++ b/Set-Algebra/index.html
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+ ${i+1}.
- -
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Set-Algebra/script.js b/Set-Algebra/script.js
new file mode 100644
index 0000000..b13cfa8
--- /dev/null
+++ b/Set-Algebra/script.js
@@ -0,0 +1,377 @@
+let maxNum = 26;
+let currNum = 2;
+
+function AddSet() {
+
+ if (currNum < 26) {
+
+ let charNum = 65 + currNum;
+ currNum++;
+
+ node = document.getElementById('sets');
+ node.insertAdjacentHTML('beforeend', `
+
+
+ CDM
+
+
+ Set Algebra
+Boolean Algebra
+
+
+
+
+
+
+
+
+ Sets
+
+
+
+
+
+ Set A =
+ +
+
+ Set B =
+ +
+
+
+
+ Problem
+ + +
+
+
+
+ Result
+ +Define sets: A, B, C, and Universal set. Then write the problem you need to solve.
+
+
+ !
+ Complement
+
+
+ /
+ Intersection
+
+
+ +
+ Union
+
+
+ -
+ Substraction
+
+
+ !
+ Complement
+/
+ Intersection
++
+ Union
+-
+ Substraction
+
+
`);
+
+ } else {
+ alert('You have reached a limint of available sets');
+ }
+}
+
+let universalSet = new Set();
+
+function Complement(set) {
+ return (checkEmpty(set)) ? universalSet : Difference(universalSet, set);
+}
+
+function Intersection(set1, set2) {
+
+ let _intersection = new Set();
+
+ set1.forEach(element => {
+ if (set2.has(element)) {
+ _intersection.add(element);
+ }
+ });
+
+ return sortSet(_intersection);
+}
+
+function Union(set1, set2) {
+
+ let _union = new Set(set1);
+
+ set2.forEach(element => {
+ _union.add(element);
+ });
+
+ return sortSet(_union);
+}
+
+function Difference(set1, set2) {
+
+ let _difference = new Set(set1);
+
+ set2.forEach(element => {
+
+ if (_difference.has(element)) {
+ _difference.delete(element);
+ }
+ });
+
+ return sortSet(_difference);
+}
+
+function sortSet(set) {
+ let entries = [];
+ for (let member of set) {
+ entries.push(+member);
+ }
+ set.clear();
+ for (let entry of entries.sort((a, b) => a - b)) {
+ set.add(entry);
+ }
+ return set;
+};
+
+const OPERATORS = new Set(['~', '!', '∩', '/', '∪', '+', '-']);
+const BRACKETS = new Set(['(', ')']);
+
+let SETSNAMES = new Set();
+let SETS = new Array();
+
+function Evaluate(hide = false) {
+ if (hide == true) {
+ let stepByStep = document.getElementById('stepByStep');
+ stepByStep.classList.add('hide');
+ }
+
+ FetchSets();
+
+ let formulaString = document.getElementById('formula').value;
+
+ let charArray = formulaString.split('');
+ let RPN_Array = ConvertFormulaCharArrayToRPN(charArray);
+
+ let result = SolveRPNFormula(RPN_Array);
+
+ let readableResult = ConvertToReadableResult(result);
+
+ let resultField = document.getElementById('result');
+ resultField.value = readableResult;
+
+ SETSNAMES.clear();
+ SETS = new Array();
+ universalSet = new Set();
+}
+
+function ConvertFormulaCharArrayToRPN(chars) {
+
+ let setsStack = new Array();
+ let actionsStack = new Array();
+
+ chars.forEach(element => {
+
+ if (SETSNAMES.has(element)) {
+
+ setsStack.push(GetSetFromIndex(element));
+ }
+
+ if (OPERATORS.has(element)) {
+
+ while (GetActionPriority(actionsStack[actionsStack.length - 1]) >= GetActionPriority(element)) {
+
+ let last = actionsStack.pop();
+
+ if (last != '(') {
+ setsStack.push(last);
+ } else {
+ break;
+ }
+ }
+
+ if (actionsStack[0] == undefined || GetActionPriority(actionsStack[actionsStack.length - 1]) < GetActionPriority(element)) {
+
+ actionsStack.push(element);
+ }
+ }
+
+ if (BRACKETS.has(element)) {
+
+ if (element == '(') {
+
+ actionsStack.push(element);
+ }
+
+ if (element == ')') {
+
+ let last = actionsStack.pop();
+
+ while (last != '(') {
+
+ setsStack.push(last);
+ last = actionsStack.pop();
+ }
+ }
+ }
+ });
+
+ while (actionsStack[0] != undefined) {
+
+ setsStack.push(actionsStack.pop());
+ }
+
+ return setsStack;
+}
+
+function SolveRPNFormula(RPN_Array) {
+
+ let stack = new Array();
+
+ for (let i = 0; i < RPN_Array.length; i++) {
+ const element = RPN_Array[i];
+
+ if (OPERATORS.has(element)) {
+
+ if (element == '~' || element == '!') {
+
+ let currSet = stack.pop();
+ let result = Complement(currSet);
+
+ printStep('!', currSet, '', result);
+ stack.push(result);
+ } else if (element == '∩' || element == '/') {
+
+ let secondSet = stack.pop();
+ let firstSet = stack.pop();
+
+ let result = Intersection(firstSet, secondSet);
+
+ printStep('/', firstSet, secondSet, result);
+ stack.push(result);
+ } else if (element == '∪' || element == '+') {
+
+ let secondSet = stack.pop();
+ let firstSet = stack.pop();
+
+ let result = Union(firstSet, secondSet);
+
+ printStep('+', firstSet, secondSet, result);
+ stack.push(result);
+ } else if (element == '-') {
+
+ let secondSet = stack.pop();
+ let firstSet = stack.pop();
+
+ let result = Difference(firstSet, secondSet);
+
+ printStep('-', firstSet, secondSet, result);
+ stack.push(result);
+ }
+ } else {
+ stack.push(element);
+ }
+ }
+
+ return stack[0];
+}
+
+function FetchSets() {
+
+ let universalArray = new Array();
+
+ for (let i = 0; i < currNum; i++) {
+
+ let inputField = document.getElementById(`set${i}`);
+
+ let numArray;
+ if (inputField != undefined && inputField.value.length != 0) {
+ numArray = inputField.value.split(',');
+
+ numArray.sort();
+
+ let newSet = new Set();
+
+ numArray.forEach(element => {
+
+ newSet.add(+element);
+ universalArray.push(+element);
+ });
+
+ SETSNAMES.add(String.fromCharCode(65 + i));
+ SETS.push(sortSet(newSet));
+ } else {
+ SETS.push(new Set());
+ }
+ }
+
+ universalSet = sortSet(new Set(universalArray));
+}
+
+
+function GetSetFromIndex(index) {
+ let unicode = index.charCodeAt(0);
+ let num = unicode - 65;
+
+ return SETS[num];
+}
+
+function GetActionPriority(action) {
+
+ if (action == '~' || action == '!') {
+ return 5;
+ } else if (action == '∩' || action == '/') {
+ return 4;
+ } else if (action == '∪' || action == '+') {
+ return 3;
+ } else if (action == '-') {
+ return 2;
+ } else if (action == '(') {
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+function ConvertToReadableResult(unconverted) {
+ return (checkEmpty(unconverted)) ? "Empty Set" : Array.from(unconverted).sort((a, b) => a - b).join(', ');
+}
+
+function checkEmpty(set) {
+ return (set == undefined || set.size == 0) ? true : false;
+}
+
+//----------------------------- Step by Step ---------------------------
+
+function stepByStep() {
+ let stepByStep = document.getElementById('stepByStep');
+ let clear = document.getElementById('steps');
+ clear.remove();
+
+ step = 0;
+ stepByStep.classList.remove('hide');
+ stepByStep.insertAdjacentHTML('beforeend', ` Set &#${charNum} =
+ +
+
`);
+ Evaluate();
+}
+
+let step = 0;
+
+function printStep(operation, firstSet, secondSet, result) {
+ step++;
+
+ let str = '';
+ let img = "";
+ switch (operation) {
+ case '!':
+ str = `!${setToString(firstSet)} = ${setToString(result)}`;
+ img = "Complement.png";
+ break;
+
+ case '/':
+ str = `${setToString(firstSet)} / ${setToString(secondSet)} = ${setToString(result)}`;
+ img = "Intersection.png";
+ break;
+
+ case '+':
+ str = `${setToString(firstSet)} + ${setToString(secondSet)} = ${setToString(result)}`;
+ img = "Union.png";
+ break;
+
+ case '-':
+ str = `${setToString(firstSet)} - ${setToString(secondSet)} = ${setToString(result)}`;
+ img = "Substraction.png";
+ break;
+
+ default:
+ break;
+ }
+
+ let steps = document.getElementById('steps');
+ steps.insertAdjacentHTML('beforeend', ` Step by step
+
+ 
+
`);
+}
+
+function setToString(set) {
+ let str = '';
+ if (checkEmpty(set)) {
+ return '{ Empty Set }'
+ } else {
+ for (let num of set) {
+ str += ', ' + num;
+ }
+ }
+ return '{ ' + str.slice(2, str.length) + ' }';
+}
+
+
+//----------------------------- Check Input ---------------------------
+
+const symbols = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'Backspace', 'ArrowLeft', 'ArrowRight', 'Delete'];
+
+function checkInputSet(key, value) {
+ if (value[value.length - 1] == ',' && symbols.indexOf(key) !== -1) {
+ return true;
+ } else if (symbols.indexOf(value[value.length - 1]) !== -1 && key == ',') {
+ return true;
+ } else if (symbols.indexOf(key) !== -1) {
+ return true;
+ } else {
+ return false;
+ }
+}
+
+const symbols2 = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K',
+ 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
+ 'W', 'X', 'Y', 'Z', 'Backspace', 'ArrowLeft', 'ArrowRight', 'Delete',
+ '-', '+', '/', '!', '(', ')'
+];
+
+function checkInputProblem(key) {
+ return (symbols2.indexOf(key) != -1) ? true : false;
+}
\ No newline at end of file
diff --git a/fonts/MyriadPro-Light.ttf b/fonts/MyriadPro-Light.ttf
new file mode 100644
index 0000000..e40ef34
Binary files /dev/null and b/fonts/MyriadPro-Light.ttf differ
diff --git a/fonts/MyriadPro-Light.woff b/fonts/MyriadPro-Light.woff
new file mode 100644
index 0000000..cc65345
Binary files /dev/null and b/fonts/MyriadPro-Light.woff differ
diff --git a/fonts/MyriadPro-Regular.woff b/fonts/MyriadPro-Regular.woff
new file mode 100644
index 0000000..4780932
Binary files /dev/null and b/fonts/MyriadPro-Regular.woff differ
diff --git a/img/Boolean-Algebra.png b/img/Boolean-Algebra.png
new file mode 100644
index 0000000..5dd962f
Binary files /dev/null and b/img/Boolean-Algebra.png differ
diff --git a/img/Set-Algebra.png b/img/Set-Algebra.png
new file mode 100644
index 0000000..460ba6f
Binary files /dev/null and b/img/Set-Algebra.png differ
diff --git a/img/favicon.png b/img/favicon.png
new file mode 100644
index 0000000..ac7e592
Binary files /dev/null and b/img/favicon.png differ
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..60cee11
--- /dev/null
+++ b/index.html
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+ ${step}.
+ +
+
+
+
+
+
+
+
+ CDM
+
+
+ Set Algebra
+Boolean Algebra
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/style.css b/style.css
index 7605b44..d2b992a 100644
--- a/style.css
+++ b/style.css
@@ -83,8 +83,7 @@ h4,
h5,
h6 {
font-size: 18px;
- font-weight: 400;
- font-family: Roboto, sans-serif;
+ font-family: Myriad-L, sans-serif;
color: #fff;
line-height: 1.2;
}
@@ -93,7 +92,16 @@ a {
color: #fff;
}
-@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap');
+@font-face {
+ font-family: Myriad-L;
+ src: url(fonts/MyriadPro-Light.ttf);
+}
+
+@font-face {
+ font-family: Myriad-R;
+ src: url(fonts/MyriadPro-Regular.woff);
+}
+
/* ------------------------------------------------------------------ */
@@ -101,6 +109,7 @@ h1 {
color: #fff;
margin: 0 auto;
margin-bottom: 10px;
+ letter-spacing: 0.75px;
}
h6 {
@@ -109,6 +118,10 @@ h6 {
text-align: center;
}
+h3 {
+ letter-spacing: 0.5px;
+}
+
h2 {
font-weight: 300;
}
@@ -171,13 +184,15 @@ body {
width: 50%;
}
-.set {
+.set,
+.value {
width: 90%;
margin: 0 auto;
padding: 5px;
}
-#sets, #values {
+#sets,
+#values {
display: flex;
flex-direction: column;
}
@@ -191,6 +206,7 @@ body {
.text {
margin: auto 0;
white-space: pre;
+ letter-spacing: 0.75px;
}
.input {
@@ -205,7 +221,7 @@ input[type=value] {
border: 3px solid rgba(255, 255, 255, 0.2);
border-radius: 8px;
font-size: 18px;
- font-family: Roboto;
+ font-family: Myriad-R;
color: #fff;
margin: 5px auto;
padding: 0px 0px 0px 10px;
@@ -231,7 +247,13 @@ input[type=button] {
border-radius: 22px;
cursor: pointer;
font-size: 18px;
- font-family: Roboto;
+ font-family: Myriad-R;
+ transition: 1s;
+}
+
+input[type=button]:hover {
+ background-color: rgba(255, 255, 255, 0.7);
+ transition: 1s;
}
input[type=result] {
@@ -242,7 +264,7 @@ input[type=result] {
color: white;
border-radius: 8px;
font-size: 18px;
- font-family: Roboto;
+ font-family: Myriad-R;
cursor: default;
padding: 0px 0px 0px 10px;
}
@@ -255,7 +277,7 @@ input[type=result] {
::placeholder {
color: rgba(255, 255, 255, 0.35);
font-size: 18px;
- font-family: Roboto;
+ font-family: Myriad-R;
}
.addSet,
@@ -265,6 +287,7 @@ input[type=result] {
.buttons {
margin: 0 auto;
+ display: flex;
}
.button {
@@ -306,6 +329,43 @@ input[type=result] {
display: none;
}
+.input-wrap img {
+ margin: auto 10px;
+ height: 50px;
+}
+
+
+/* ------------------Main-------------- */
+
+.calculator {
+ display: flex;
+ flex-direction: column;
+ margin: 20px auto;
+ width: 90%;
+ max-width: 250px;
+ background-color: rgba(255, 255, 255, 0.3);
+ border-radius: 20px;
+ padding: 20px;
+ transition: 1s;
+}
+
+.calculator img {
+ height: 100px;
+ margin: 20px auto;
+}
+
+.calculator:hover {
+ background-color: rgba(255, 255, 255, 0.5);
+ transition: 1s;
+}
+
+.calculator h1 {
+ margin: 0 auto;
+ text-align: center;
+ font-size: 23px;
+ max-width: 200px;
+}
+
@media screen and (max-device-width: 650px) and (min-device-width: 0px) {
.wrapper {
flex-direction: column;
@@ -315,4 +375,11 @@ input[type=result] {
width: 85%;
margin: 20px auto;
}
+ .buttons {
+ flex-direction: column;
+ margin-top: 15px;
+ }
+ .button {
+ margin: 10px auto;
+ }
}
\ No newline at end of file
+ 
+