Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tp-math
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Math
2e-annee
tp-math
Commits
e9bdd4cc
Commit
e9bdd4cc
authored
2 years ago
by
thibault.capt
Browse files
Options
Downloads
Patches
Plain Diff
Update mat
parent
468101a5
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Equation.java
+35
-10
35 additions, 10 deletions
src/Equation.java
src/Main.java
+2
-2
2 additions, 2 deletions
src/Main.java
with
37 additions
and
12 deletions
src/Equation.java
+
35
−
10
View file @
e9bdd4cc
...
@@ -90,19 +90,44 @@ public class Equation {
...
@@ -90,19 +90,44 @@ public class Equation {
* @param elements les elements
* @param elements les elements
* @param line la line en question
* @param line la line en question
*/
*/
public
void
create
Min
Eq
(
String
[]
elements
,
int
line
)
{
public
int
createEq
(
String
[]
elements
,
int
line
)
{
try
{
try
{
// vecteur de droite
// vecteur de droite
switch
(
elements
[
5
])
{
case
"="
:
// Si ax=b => ax <= b; ax >= b
// Vecteur de droite
setRightVec
(
Double
.
parseDouble
(
elements
[
elements
.
length
-
1
]));
setRightVec
(
Double
.
parseDouble
(
elements
[
elements
.
length
-
1
]));
setRightVec
(
Double
.
parseDouble
(
elements
[
elements
.
length
-
1
]));
// Matrice
// Matrice
for
(
int
i
=
0
;
i
<
5
;
i
++)
{
for
(
int
i
=
0
;
i
<
5
;
i
++)
{
setMat
(
Double
.
parseDouble
(
elements
[
i
]),
line
,
i
);
setMat
(
Double
.
parseDouble
(
elements
[
i
]),
line
,
i
);
setMat
(
Double
.
parseDouble
(
elements
[
i
]),
line
+
1
,
i
);
}
}
// On rajoute une ligne
line
+=
1
;
break
;
case
">="
:
// Vecteur de droite
setRightVec
(-
Double
.
parseDouble
(
elements
[
elements
.
length
-
1
]));
// Matrice
for
(
int
i
=
0
;
i
<
5
;
i
++)
setMat
(-
Double
.
parseDouble
(
elements
[
i
]),
line
,
i
);
break
;
case
"<="
:
// Vecteur de droite
setRightVec
(
Double
.
parseDouble
(
elements
[
elements
.
length
-
1
]));
// Matrice
for
(
int
i
=
0
;
i
<
5
;
i
++)
setMat
(
Double
.
parseDouble
(
elements
[
i
]),
line
,
i
);
break
;
}
}
catch
(
NumberFormatException
ex
)
{
}
catch
(
NumberFormatException
ex
)
{
ex
.
printStackTrace
();
ex
.
printStackTrace
();
}
}
return
line
;
}
}
/**
/**
...
...
This diff is collapsed.
Click to expand it.
src/Main.java
+
2
−
2
View file @
e9bdd4cc
...
@@ -31,7 +31,7 @@ public class Main {
...
@@ -31,7 +31,7 @@ public class Main {
String
[]
elements
;
String
[]
elements
;
int
widthMat
=
nbLines
(
sc
);
int
widthMat
=
nbLines
(
sc
);
sc
=
new
Scanner
(
f
);
// remettre le scanner à la première ligne
sc
=
new
Scanner
(
f
);
// remettre le scanner à la première ligne
Equation
eq
=
new
Equation
(
widthMat
);
Equation
eq
=
new
Equation
(
widthMat
*
2
);
// lignes supp au cas où, il y a des "="
int
line
=
0
;
int
line
=
0
;
// Max / Min + function obj
// Max / Min + function obj
...
@@ -48,7 +48,7 @@ public class Main {
...
@@ -48,7 +48,7 @@ public class Main {
case
"min"
:
case
"min"
:
case
"max"
:
case
"max"
:
// création de l'équation dans le sens min
// création de l'équation dans le sens min
eq
.
create
Min
Eq
(
elements
,
line
);
line
=
eq
.
createEq
(
elements
,
line
);
break
;
break
;
default
:
default
:
System
.
err
.
println
(
"Le sens n'a pas été entré."
);
System
.
err
.
println
(
"Le sens n'a pas été entré."
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment