theoludwig/FunctionProject
Archived
1
1
Fork 0
Code Pull Requests Actions Releases Activity

Small Hotfix documentation + convertArabicToRoman

Browse Source
This commit is contained in:
Divlo
2019-11-16 10:17:28 +01:00
parent 4056781fac
commit 2226c02601
32 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/fonctions_principales.js
View File

@ -520,9 +520,9 @@ function convertRomanToArabic(str) {
let result = 0;
for (let i = 0;i < correspondancesRomainArabe.length; i++) {
while (str.indexOf(correspondancesRomainArabe[i][1]) === 0){
// Adding the decimal value to our result counter
// Ajout de la valeur décimale au résultat
result += correspondancesRomainArabe[i][0];
// Remove the matched Roman letter from the beginning
// Supprimer la lettre romaine correspondante du début
str = str.replace(correspondancesRomainArabe[i][1],'');
}
}

28
scripts/main.js
View File

@ -147,27 +147,27 @@ $(function () {
if(isEmptyValue(numbersValue)) {
$('.results').html(emptyMessageError);
}
else if (!isNaN(Number(numbersValue)) && convertNumberType === "Nombre Romain") {
const result = convertArabicToRoman(parseInt(numbersValue));
let numbersValueFormat = formatNumberResult(numbersValue);
if (result === messageError || isFloat(numbersValue)) {
$('.results').html(messageError);
else if (!isNaN(Number(numbersValue))) {
if (convertNumberType === "Nombre Romain") {
const result = convertArabicToRoman(parseInt(numbersValue));
let numbersValueFormat = formatNumberResult(numbersValue);
if (result === messageError || isFloat(numbersValue)) {
$('.results').html(messageError);
} else {
$('.results').html(`<b>${numbersValueFormat}</b> s'écrit <b>${result}</b> en chiffres romains.`);
}
} else {
$('.results').html(`<b>${numbersValueFormat}</b> s'écrit <b>${result}</b> en chiffres romains.`);
$('.results').html(`<b>${numbersValue}</b> est déjà en chiffres arabes.`);
}
}
else if (convertNumberType === "Nombre Arabe") {
if (!isNaN(Number(numbersValue))) {
$('.results').html(`<b>${numbersValue}</b> est déjà en chiffres arabes.`);
} else {
numbersValue = numbersValue.toUpperCase();
const result = convertRomanToArabic(numbersValue);
const result = convertRomanToArabic(numbersValue.toUpperCase());
if (result === 0) {
$('.results').html(messageError);
} else {
$('.results').html(`<b>${numbersValue}</b> s'écrit <b>${formatNumberResult(result)}</b> en chiffres arabes.`);
}
}
}
else {
$('.results').html(messageError);
@ -191,12 +191,14 @@ $(function () {
$('.results').html(emptyMessageError);
}
else {
const start = new Date();
const stringPermutationsResult = stringPermutations(value);
let result = "";
for (element in stringPermutationsResult) {
result = result + stringPermutationsResult[element] + "<br>";
}
$('.results').html(`Il y a ${formatNumberResult(stringPermutationsResult.length)} possibilités d'anagramme pour le mot "${value}" qui contient ${value.length} caractères, la liste : <br><br> ${result}`);
const end = new Date();
$('.results').html(`Temps d'éxecution du script : ${end - start} ms. <br>Il y a ${formatNumberResult(stringPermutationsResult.length)} possibilités d'anagramme pour le mot "${value}" qui contient ${value.length} caractères, la liste : <br><br> ${result}`);
}
});