Skip to content

Commit

Permalink
correctif git
Browse files Browse the repository at this point in the history
  • Loading branch information
LeoMendesEsEtml committed Dec 9, 2024
1 parent ec99054 commit 8a5bd1b
Show file tree
Hide file tree
Showing 113 changed files with 1,590 additions and 13 deletions.
9 changes: 9 additions & 0 deletions .idea/POBJ_SLO2_24_25.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Exercices/Ex2_ConversionC_POO/Ex1/.vs/Ex1/v17/.suo
Binary file not shown.
Binary file modified Exercices/Ex2_ConversionC_POO/Ex1/.vs/Ex1/v17/Browse.VC.db
Binary file not shown.
Binary file not shown.
24 changes: 21 additions & 3 deletions Exercices/Ex3_Fonctions_POO/Ex2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@ using namespace std;


// Fonction Extract

// Fonction Extract
unsigned short Extract(unsigned long totalSeconds, unsigned short& hours, unsigned short& minutes) {
// Calcul des heures
hours = totalSeconds / 3600;
// Calcul des minutes restantes
minutes = (totalSeconds % 3600) / 60;
// Retourne les secondes restantes
return totalSeconds % 60;
}

// Fonction AfficheB

Expand All @@ -20,11 +28,12 @@ int main (void)
{
char UserAnswer;
int ValA, ValB;
unsigned short hours, minutes, seconds; // Variables pour Test A
// Variables pour test A, B et C


// a adapter
cout << "Exercice 2 : Huber Christian" << endl;
cout << "Exercice 2 : Mendes Leo" << endl;


do {
Expand All @@ -36,7 +45,16 @@ int main (void)
case 'a':
cout << "TestA: entrez un nombre de secondes" << endl;
cin >> ValA;

if (ValA >= 0) {
seconds = Extract(static_cast<unsigned long>(ValA), hours, minutes);
cout << "ValA = " << ValA
<< " NbHeures = " << hours
<< " NbMinutes = " << minutes
<< " NbSecondes = " << seconds << endl;
}
else {
cout << "Veuillez entrer une valeur positive." << endl;
}
break;

case 'B':
Expand Down
Binary file not shown.
Binary file not shown.
Binary file added Exercices/Ex3_Fonctions_POO/Ex2/.vs/Ex2/v17/.suo
Binary file not shown.
Binary file not shown.
Binary file not shown.
31 changes: 31 additions & 0 deletions Exercices/Ex3_Fonctions_POO/Ex2/Ex2.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32630.192
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ex2", "Ex2.vcxproj", "{A9CE8A1E-0702-45BF-9DD3-536A7CA6F62C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A9CE8A1E-0702-45BF-9DD3-536A7CA6F62C}.Debug|x64.ActiveCfg = Debug|x64
{A9CE8A1E-0702-45BF-9DD3-536A7CA6F62C}.Debug|x64.Build.0 = Debug|x64
{A9CE8A1E-0702-45BF-9DD3-536A7CA6F62C}.Debug|x86.ActiveCfg = Debug|Win32
{A9CE8A1E-0702-45BF-9DD3-536A7CA6F62C}.Debug|x86.Build.0 = Debug|Win32
{A9CE8A1E-0702-45BF-9DD3-536A7CA6F62C}.Release|x64.ActiveCfg = Release|x64
{A9CE8A1E-0702-45BF-9DD3-536A7CA6F62C}.Release|x64.Build.0 = Release|x64
{A9CE8A1E-0702-45BF-9DD3-536A7CA6F62C}.Release|x86.ActiveCfg = Release|Win32
{A9CE8A1E-0702-45BF-9DD3-536A7CA6F62C}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7BE7A70B-20C5-4500-99CC-915A7AE948BA}
EndGlobalSection
EndGlobal
135 changes: 135 additions & 0 deletions Exercices/Ex3_Fonctions_POO/Ex2/Ex2.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{a9ce8a1e-0702-45bf-9dd3-536a7ca6f62c}</ProjectGuid>
<RootNamespace>Ex2</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Ex2.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
22 changes: 22 additions & 0 deletions Exercices/Ex3_Fonctions_POO/Ex2/Ex2.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Fichiers sources">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Fichiers d%27en-tête">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Fichiers de ressources">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Ex2.cpp">
<Filter>Fichiers sources</Filter>
</ClCompile>
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions Exercices/Ex3_Fonctions_POO/Ex2/Ex2.vcxproj.user
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
Binary file not shown.
11 changes: 11 additions & 0 deletions Exercices/Ex3_Fonctions_POO/Ex2/x64/Debug/Ex2.exe.recipe
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ProjectOutputs>
<ProjectOutput>
<FullPath>C:\LMS\Git_Mendes\Depot_1\POBJ_SLO2_24_25\Exercices\Ex3_Fonctions_POO\Ex2\x64\Debug\Ex2.exe</FullPath>
</ProjectOutput>
</ProjectOutputs>
<ContentFiles />
<SatelliteDlls />
<NonRecipeFileRefs />
</Project>
Binary file not shown.
3 changes: 3 additions & 0 deletions Exercices/Ex3_Fonctions_POO/Ex2/x64/Debug/Ex2.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
 Ex2.cpp
C:\LMS\Git_Mendes\Depot_1\POBJ_SLO2_24_25\Exercices\Ex3_Fonctions_POO\Ex2.cpp(14,23): warning C4244: '=' : conversion de 'unsigned long' en 'unsigned short', perte possible de données
Ex2.vcxproj -> C:\LMS\Git_Mendes\Depot_1\POBJ_SLO2_24_25\Exercices\Ex3_Fonctions_POO\Ex2\x64\Debug\Ex2.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.32.31326:TargetPlatformVersion=10.0.19041.0:
Debug|x64|C:\LMS\Git_Mendes\Depot_1\POBJ_SLO2_24_25\Exercices\Ex3_Fonctions_POO\Ex2\|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
C:\LMS\Git_Mendes\Depot_1\POBJ_SLO2_24_25\Exercices\Ex3_Fonctions_POO\Ex2\x64\Debug\Ex2.exe
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x64\Debug\\_IsIncrementalBuild
Binary file not shown.
Binary file not shown.
19 changes: 19 additions & 0 deletions Exercices/Ex4_ClassFigGeo_POO/Cercle.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#include "Cercle.h"
#define _USE_MATH_DEFINES
#include <cmath>
#include <iostream>

Cercle::Cercle() : FormesGeometriques() {
std::cout << "Constructeur de Cercle" << std::endl;
}

double Cercle::CalculerSurface(double x1, double /* x2 */) {
double rayon = x1 / 2.0;
Surface = M_PI * rayon * rayon; // Calcul de la surface
return Surface;
}

double Cercle::CalculerPerimetre(double x1, double /* x2 */) {
Perimetre = M_PI * x1; // Calcul du périmčtre
return Perimetre;
}
22 changes: 22 additions & 0 deletions Exercices/Ex4_ClassFigGeo_POO/Cercle.cpp.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#include "CERCLE.h"




double CERCLE::CalculerSurface(double diametre)
// don't delete the following line as it's needed to preserve source code of this autogenerated element
// section 10--28--98-99--373ca81a:1931a7a8a3d:-8000:0000000000000D6C begin
{
return 0.0;
}
// section 10--28--98-99--373ca81a:1931a7a8a3d:-8000:0000000000000D6C end
// don't delete the previous line as it's needed to preserve source code of this autogenerated element

double CERCLE::CalculerPerimetre(double diametre)
// don't delete the following line as it's needed to preserve source code of this autogenerated element
// section 10--28--98-99--373ca81a:1931a7a8a3d:-8000:0000000000000D6F begin
{
return 0.0;
}
// section 10--28--98-99--373ca81a:1931a7a8a3d:-8000:0000000000000D6F end
// don't delete the previous line as it's needed to preserve source code of this autogenerated element
Loading

0 comments on commit 8a5bd1b

Please sign in to comment.