Skip to content

Commit

Permalink
[MVN] Fix overall plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
RoiArthurB committed Jan 8, 2025
1 parent 4023927 commit 8a361c5
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 36 deletions.
2 changes: 1 addition & 1 deletion gama.experimental.MPI/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MPI
Bundle-SymbolicName: gama.experimental.MPI;singleton:=true
Bundle-Version: 0.0.0.qualifier
Bundle-Version: 2024.6.0.qualifier
Automatic-Module-Name: gama.experimental.MPI
Bundle-Activator: pluginActivator.MPIActivator
Bundle-RequiredExecutionEnvironment: JavaSE-21
Expand Down
3 changes: 1 addition & 2 deletions gama.experimental.feature.markdown/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.gama</groupId>
<artifactId>gama.experimental.markdown</artifactId>
<artifactId>gama.experimental.feature.markdown</artifactId>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>org.gama</groupId>
Expand Down
2 changes: 1 addition & 1 deletion gama.experimental.gampy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ information regarding copyright ownership.
<groupId>org.deeplearning4j</groupId>
<artifactId>model-import-examples</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>model import examples</name>
<name>gama.experimental.gampy</name>
<description>Loading models trained in keras or tensorflow</description>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion gama.experimental.genstar/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Genstar
Bundle-SymbolicName: gama.experimental.genstar;singleton:=true
Bundle-Version: 0.0.0.qualifier
Bundle-Version: 2024.6.0.qualifier
Automatic-Module-Name: espacedev.gaml.extensions.genstar
Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: com.google.guava;bundle-version="30.1.0",
Expand Down
4 changes: 2 additions & 2 deletions gama.experimental.genstar/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>espacedev.gaml.extensions.genstar</groupId>
<artifactId>espacedev.gaml.extensions.genstar</artifactId>
<groupId>org.gama</groupId>
<artifactId>gama.experimental.genstar</artifactId>
<packaging>eclipse-plugin</packaging>
<parent>
<groupId>org.gama</groupId>
Expand Down
3 changes: 1 addition & 2 deletions gama.experimental.hydro.hecras/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ummisco.gama.extension.hecras</groupId>
<artifactId>ummisco.gama.extension.hecras</artifactId>
<artifactId>gama.experimental.hydro.hecras</artifactId>
<packaging>eclipse-plugin</packaging>
<parent>
<groupId>org.gama</groupId>
Expand Down
3 changes: 1 addition & 2 deletions gama.experimental.hydro.mike/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ummisco.gaml.extensions.mike</groupId>
<artifactId>ummisco.gaml.extensions.mike</artifactId>
<artifactId>gama.experimental.hydro.mike</artifactId>
<packaging>eclipse-plugin</packaging>
<parent>
<groupId>org.gama</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
import gama.core.util.IList;
import gama.core.util.IMap;
import gama.core.util.file.GamaGeometryFile;
import gama.gaml.operators.Spatial;
import gama.gaml.operators.spatial.*;
import gama.gaml.types.GamaGeometryType;
import gama.gaml.types.IType;
import gama.gaml.types.Types;
Expand Down Expand Up @@ -177,7 +177,7 @@ public void addTranslation(final GamaPoint transl) {

public void addRotation(final GamaPoint xVector) {
xDir = toNewRef(xVector, true);
yDir = (GamaPoint) Spatial.Transformations.rotated_by(GAMA.getRuntimeScope(), xVector, 90).getLocation();
yDir = (GamaPoint) SpatialTransformations.rotated_by(GAMA.getRuntimeScope(), xVector, 90).getLocation();
}

public void addRotation(final GamaPoint xVector, final GamaPoint zVector) {
Expand Down Expand Up @@ -249,7 +249,7 @@ public IShape createOpening(final IScope scope, final IfcOpeningElement o) {
final List<IfcAxis2Placement> aps = new ArrayList<>();
relatedTo(scope, o.getObjectPlacement(), aps);
newAxe.update(aps, true);
final IShape box = Spatial.Creation.sphere(scope, 0.2);
final IShape box = SpatialCreation.sphere(scope, 0.2);
addAttribtutes(o, box);
newAxe.transform(box);

Expand All @@ -263,7 +263,7 @@ public IShape createOpening(final IScope scope, final IfcOpeningElement o) {
* Double depth = solid.getDepth().value; if (solid.getSweptArea() instanceof IfcRectangleProfileDef) { final
* IfcRectangleProfileDef profil = (IfcRectangleProfileDef) solid.getSweptArea(); final Double height =
* profil.getXDim().value; final Double width = profil.getYDim().value; final IShape box =
* Spatial.Creation.box(scope, height, width, depth); box.setAttribute(IKeyword.NAME,
* SpatialCreation.box(scope, height, width, depth); box.setAttribute(IKeyword.NAME,
* o.getName().getDecodedValue()); newAxe.transform(box); addAttribtutes(o, box);
*
* return box; }
Expand Down Expand Up @@ -298,14 +298,14 @@ public IShape createDoor(final IScope scope, final IfcDoor d, final Map<IfcProdu
if (depth == null || depth == 0.0) {
depth = width / 10.0;
}
IShape box = Spatial.Creation.box(scope, width, depth, height);
box = Spatial.Transformations.translated_by(scope, box, new GamaPoint(width / 2.0, 0.0));
IShape box = SpatialCreation.box(scope, width, depth, height);
box = SpatialTransformations.translated_by(scope, box, new GamaPoint(width / 2.0, 0.0));
final IList<IShape> pts = GamaListFactory.create(Types.GEOMETRY);
pts.add(new GamaPoint(-depth / 2.0, 0));
pts.add(new GamaPoint(depth / 2.0, 0.0));
final IShape line = Spatial.Creation.line(scope, pts);
final IShape line = SpatialCreation.line(scope, pts);
box.setAttribute(IKeyword.NAME, d.getName().getDecodedValue());
box = Spatial.Transformations.translated_by(scope, box,
box = SpatialTransformations.translated_by(scope, box,
new GamaPoint(line.getLocation().getX() - line.getPoints().get(0).getX(),
line.getLocation().getY() - line.getPoints().get(0).getY()));

Expand Down Expand Up @@ -366,14 +366,14 @@ public IShape createWindow(final IScope scope, final IfcWindow d, final Map<IfcP
depth = width / 10.0;
}

IShape box = Spatial.Creation.box(scope, width, depth, height);
IShape box = SpatialCreation.box(scope, width, depth, height);

box.setAttribute(IKeyword.NAME, d.getName().getDecodedValue());
final IList<IShape> pts = GamaListFactory.create(Types.GEOMETRY);
pts.add(new GamaPoint(-width / 2.0, 0.0));
pts.add(new GamaPoint(width / 2.0, 0.0));
final IShape line = Spatial.Creation.line(scope, pts);
box = Spatial.Transformations.translated_by(scope, box,
final IShape line = SpatialCreation.line(scope, pts);
box = SpatialTransformations.translated_by(scope, box,
new GamaPoint(line.getLocation().getX() - line.getPoints().get(0).getX(), 1.5 * depth));

addAttribtutes(d, box);
Expand All @@ -383,13 +383,13 @@ public IShape createWindow(final IScope scope, final IfcWindow d, final Map<IfcP
final IfcAxis2Placement2D axispl2D = (IfcAxis2Placement2D) axisplFirst;
if (axispl2D.getRefDirection() != null) {
final GamaPoint dir = toPoint(axispl2D.getRefDirection());
box = Spatial.Transformations.rotated_by(scope, box, 90 * dir.y);
box = SpatialTransformations.rotated_by(scope, box, 90 * dir.y);
}
} else if (axisplFirst instanceof IfcAxis2Placement3D) {
final IfcAxis2Placement3D axispl3D = (IfcAxis2Placement3D) axisplFirst;
if (axispl3D.getRefDirection() != null) {
final GamaPoint dir = toPoint(axispl3D.getRefDirection());
box = Spatial.Transformations.rotated_by(scope, box, 90 * dir.y);
box = SpatialTransformations.rotated_by(scope, box, 90 * dir.y);
}
}

Expand Down Expand Up @@ -417,7 +417,7 @@ public IShape createWall(final IScope scope, final IfcWall w, final Map<IfcProdu
}
}
}
final IShape line = Spatial.Creation.line(scope, linePts);
final IShape line = SpatialCreation.line(scope, linePts);
newAxe.transform(line);
for (final IfcRepresentation r : w.getRepresentation().getRepresentations()) {
for (final IfcRepresentationItem it : r.getItems()) {
Expand All @@ -437,10 +437,10 @@ public IShape createWall(final IScope scope, final IfcWall w, final Map<IfcProdu
final Double depth = solid.getDepth().value;
depths.put(w, height);

IShape box = Spatial.Creation.box(scope, width, height, depth);
IShape box = SpatialCreation.box(scope, width, height, depth);
newAxe.transform(box);

box = Spatial.Transformations.translated_by(scope, box,
box = SpatialTransformations.translated_by(scope, box,
new GamaPoint(line.getLocation().getX() - line.getPoints().get(0).getX(),
line.getLocation().getY() - line.getPoints().get(0).getY()));
box.setAttribute(IKeyword.NAME, w.getName().getDecodedValue());
Expand Down Expand Up @@ -501,13 +501,13 @@ public IShape createSlab(final IScope scope, final IfcSlab s) {
final IfcRectangleProfileDef profil = (IfcRectangleProfileDef) solid.getSweptArea();
final Double width = profil.getXDim().value;
final Double height = profil.getYDim().value;
IShape box = Spatial.Creation.box(scope, width, height, depth);
IShape box = SpatialCreation.box(scope, width, height, depth);
box.setAttribute(IKeyword.NAME, s.getName().getDecodedValue());
newAxe.transform(box);
addAttribtutes(s, box);

getMaterial(s, box);
box = Spatial.Transformations.translated_by(scope, box, new GamaPoint(0, 0, -depth));
box = SpatialTransformations.translated_by(scope, box, new GamaPoint(0, 0, -depth));
return box;
} else if (solid.getSweptArea() instanceof IfcArbitraryClosedProfileDef) {
final IfcArbitraryClosedProfileDef profil = (IfcArbitraryClosedProfileDef) solid.getSweptArea();
Expand Down Expand Up @@ -549,7 +549,7 @@ public IShape createSpace(final IScope scope, final IfcSpace s) {
final IfcRectangleProfileDef profil = (IfcRectangleProfileDef) solid.getSweptArea();
final Double width = profil.getXDim().value;
final Double height = profil.getYDim().value;
final IShape box = Spatial.Creation.box(scope, width, height, depth);
final IShape box = SpatialCreation.box(scope, width, height, depth);
box.setAttribute(IKeyword.NAME, s.getName().getDecodedValue());
newAxe.transform(box);
addAttribtutes(s, box);
Expand Down Expand Up @@ -745,7 +745,7 @@ public Envelope3D computeEnvelope(final IScope scope) {
final GamaPoint vect = new GamaPoint(-env.getMinX(), -env.getMinY(), -env.getMinZ());
final IList<IShape> newBuffer = GamaListFactory.create(Types.GEOMETRY);
for (final IShape buff : getBuffer()) {
newBuffer.add(Spatial.Transformations.translated_by(scope, buff, vect));
newBuffer.add(SpatialTransformations.translated_by(scope, buff, vect));
}
setBuffer(newBuffer);
env = env.translate(-env.getMinX(), -env.getMinY(), -env.getMinZ());// GeometryUtils.computeEnvelopeFrom(scope,
Expand Down
3 changes: 1 addition & 2 deletions gama.experimental.imageanalysis/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>across.gaml</groupId>
<artifactId>across.gaml.extensions.imageanalysis</artifactId>
<artifactId>gama.experimental.imageanalysis</artifactId>
<packaging>eclipse-plugin</packaging>
<parent>
<groupId>org.gama</groupId>
Expand Down
3 changes: 1 addition & 2 deletions gama.experimental.markdown/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ummisco.gama.markdown.documentation</groupId>
<artifactId>ummisco.gama.markdown.documentation</artifactId>
<artifactId>gama.experimental.markdown</artifactId>
<packaging>eclipse-plugin</packaging>
<parent>
<groupId>org.gama</groupId>
Expand Down
2 changes: 1 addition & 1 deletion gama.experimental.matlab/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Extension to interface Matlab and GAMA
Bundle-SymbolicName: gama.experimental.matlab;singleton:=true
Bundle-Vendor: UMMISCO
Bundle-Version: 0.0.0.qualifier
Bundle-Version: 2024.6.0.qualifier
Automatic-Module-Name: ummisco.gama.extensions.matlab
Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: gama.core,
Expand Down

0 comments on commit 8a361c5

Please sign in to comment.