Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Zellige-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
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
IdA Public
Zellige-core
Commits
3d1959fe
Commit
3d1959fe
authored
4 years ago
by
Céline TREBEAU
Browse files
Options
Downloads
Patches
Plain Diff
Rename
parent
82f20a90
No related branches found
No related tags found
1 merge request
!10
Surface reconstruction Refactoring
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/fr/pasteur/ida/zellige/surfaceConstruction/element/os/OSE.java
+4
-8
4 additions, 8 deletions
...steur/ida/zellige/surfaceConstruction/element/os/OSE.java
with
4 additions
and
8 deletions
src/main/java/fr/pasteur/ida/zellige/surfaceConstruction/element/os/OS.java
→
src/main/java/fr/pasteur/ida/zellige/surfaceConstruction/element/os/OS
E
.java
+
4
−
8
View file @
3d1959fe
...
@@ -6,9 +6,9 @@ import java.util.*;
...
@@ -6,9 +6,9 @@ import java.util.*;
/**
/**
* OS stands for Orthogonal Surface which is list of ordered Coordinates being part of the same 1D surface.
* OS stands for Orthogonal Surface
Element
which is list of ordered Coordinates being part of the same 1D surface.
*/
*/
public
class
OS
extends
ArrayList
<
Coordinate
>
public
class
OS
E
extends
ArrayList
<
Coordinate
>
{
{
private
static
TreeSet
<
Integer
>
list
=
new
TreeSet
<>();
private
static
TreeSet
<
Integer
>
list
=
new
TreeSet
<>();
private
static
TreeMap
<
Integer
,
Integer
>
occ
=
new
TreeMap
<>();
private
static
TreeMap
<
Integer
,
Integer
>
occ
=
new
TreeMap
<>();
...
@@ -46,10 +46,6 @@ public class OS extends ArrayList< Coordinate >
...
@@ -46,10 +46,6 @@ public class OS extends ArrayList< Coordinate >
/*----------------*/
/*----------------*/
sizeSum
=
sizeSum
+
this
.
size
();
sizeSum
=
sizeSum
+
this
.
size
();
count
++;
count
++;
}
}
public
void
set
(
int
dimension
)
public
void
set
(
int
dimension
)
...
@@ -78,7 +74,7 @@ public class OS extends ArrayList< Coordinate >
...
@@ -78,7 +74,7 @@ public class OS extends ArrayList< Coordinate >
* @param dimension - the dimension in witch the OS has been constructed.
* @param dimension - the dimension in witch the OS has been constructed.
* @return true if the two OS are next to each other, false otherwise.
* @return true if the two OS are next to each other, false otherwise.
*/
*/
public
boolean
isNextTo
(
OS
next
,
int
dimension
)
public
boolean
isNextTo
(
OS
E
next
,
int
dimension
)
{
{
if
(
dimension
==
0
)
if
(
dimension
==
0
)
{
{
...
@@ -202,7 +198,7 @@ public static void setStartingStatus(int dimension)
...
@@ -202,7 +198,7 @@ public static void setStartingStatus(int dimension)
public
static
void
setCount
(
int
count
)
public
static
void
setCount
(
int
count
)
{
{
OS
.
count
=
count
;
OS
E
.
count
=
count
;
}
}
public
static
TreeMap
<
Integer
,
Integer
>
getOcc
()
public
static
TreeMap
<
Integer
,
Integer
>
getOcc
()
...
...
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