Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exercice: J'ai changé le nom de la classe PropagationProcessPathData.… #657

Open
wants to merge 1 commit into
base: 4.X
Choose a base branch
from
Open

Exercice: J'ai changé le nom de la classe PropagationProcessPathData.… #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 27 additions & 27 deletions noisemodelling-jdbc/src/main/java/org/noise_planet/noisemodelling/jdbc/JdbcNoiseMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.locationtech.jts.io.WKTWriter;
import org.noise_planet.noisemodelling.pathfinder.CnossosPropagationData;
import org.noise_planet.noisemodelling.pathfinder.ProfileBuilder;
import org.noise_planet.noisemodelling.propagation.PropagationProcessPathData;
import org.noise_planet.noisemodelling.propagation.AttenuationCnossosParameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -34,9 +34,9 @@
public abstract class JdbcNoiseMap {
// When computing cell size, try to keep propagation distance away from the cell
// inferior to this ratio (in comparison with cell width)
PropagationProcessPathData propagationProcessPathDataDay = new PropagationProcessPathData();
PropagationProcessPathData propagationProcessPathDataEvening = new PropagationProcessPathData();
PropagationProcessPathData propagationProcessPathDataNight = new PropagationProcessPathData();
AttenuationCnossosParameters attenuationCnossosParametersDay = new AttenuationCnossosParameters();
AttenuationCnossosParameters attenuationCnossosParametersEvening = new AttenuationCnossosParameters();
AttenuationCnossosParameters attenuationCnossosParametersNight = new AttenuationCnossosParameters();
Logger logger = LoggerFactory.getLogger(JdbcNoiseMap.class);
private static final int DEFAULT_FETCH_SIZE = 300;
protected int fetchSize = DEFAULT_FETCH_SIZE;
Expand Down Expand Up @@ -85,49 +85,49 @@ public JdbcNoiseMap(String buildingsTableName, String sourcesTableName) {
this.sourcesTableName = sourcesTableName;
}

public PropagationProcessPathData getPropagationProcessPathData(LDENConfig.TIME_PERIOD time_period) {
public AttenuationCnossosParameters getPropagationProcessPathData(LDENConfig.TIME_PERIOD time_period) {
switch (time_period) {
case DAY:
return propagationProcessPathDataDay;
return attenuationCnossosParametersDay;
case EVENING:
return propagationProcessPathDataEvening;
return attenuationCnossosParametersEvening;
default:
return propagationProcessPathDataNight;
return attenuationCnossosParametersNight;
}
}

public void setPropagationProcessPathData(LDENConfig.TIME_PERIOD time_period, PropagationProcessPathData propagationProcessPathData) {
public void setPropagationProcessPathData(LDENConfig.TIME_PERIOD time_period, AttenuationCnossosParameters attenuationCnossosParameters) {
switch (time_period) {
case DAY:
propagationProcessPathDataDay = propagationProcessPathData;
attenuationCnossosParametersDay = attenuationCnossosParameters;
case EVENING:
propagationProcessPathDataEvening = propagationProcessPathData;
attenuationCnossosParametersEvening = attenuationCnossosParameters;
default:
propagationProcessPathDataNight = propagationProcessPathData;
attenuationCnossosParametersNight = attenuationCnossosParameters;
}
}
public PropagationProcessPathData getPropagationProcessPathDataDay() {
return propagationProcessPathDataDay;
public AttenuationCnossosParameters getPropagationProcessPathDataDay() {
return attenuationCnossosParametersDay;
}

public void setPropagationProcessPathDataDay(PropagationProcessPathData propagationProcessPathDataDay) {
this.propagationProcessPathDataDay = propagationProcessPathDataDay;
public void setPropagationProcessPathDataDay(AttenuationCnossosParameters attenuationCnossosParametersDay) {
this.attenuationCnossosParametersDay = attenuationCnossosParametersDay;
}

public PropagationProcessPathData getPropagationProcessPathDataEvening() {
return propagationProcessPathDataEvening;
public AttenuationCnossosParameters getPropagationProcessPathDataEvening() {
return attenuationCnossosParametersEvening;
}

public void setPropagationProcessPathDataEvening(PropagationProcessPathData propagationProcessPathDataEvening) {
this.propagationProcessPathDataEvening = propagationProcessPathDataEvening;
public void setPropagationProcessPathDataEvening(AttenuationCnossosParameters attenuationCnossosParametersEvening) {
this.attenuationCnossosParametersEvening = attenuationCnossosParametersEvening;
}

public PropagationProcessPathData getPropagationProcessPathDataNight() {
return propagationProcessPathDataNight;
public AttenuationCnossosParameters getPropagationProcessPathDataNight() {
return attenuationCnossosParametersNight;
}

public void setPropagationProcessPathDataNight(PropagationProcessPathData propagationProcessPathDataNight) {
this.propagationProcessPathDataNight = propagationProcessPathDataNight;
public void setPropagationProcessPathDataNight(AttenuationCnossosParameters attenuationCnossosParametersNight) {
this.attenuationCnossosParametersNight = attenuationCnossosParametersNight;
}

public boolean isVerbose() {
Expand Down Expand Up @@ -297,8 +297,8 @@ void fetchCellBuildings(Connection connection, Envelope fetchEnvelope, List<Prof
columnIndex = JDBCUtilities.getFieldIndex(rs.getMetaData(), pkBuilding);
}
double oldAlpha = wallAbsorption;
List<Double> alphaList = new ArrayList<>(propagationProcessPathDataDay.freq_lvl.size());
for(double freq : propagationProcessPathDataDay.freq_lvl_exact) {
List<Double> alphaList = new ArrayList<>(attenuationCnossosParametersDay.freq_lvl.size());
for(double freq : attenuationCnossosParametersDay.freq_lvl_exact) {
alphaList.add(getWallAlpha(oldAlpha, freq));
}
while (rs.next()) {
Expand All @@ -317,7 +317,7 @@ void fetchCellBuildings(Connection connection, Envelope fetchEnvelope, List<Prof
// Compute building absorption value
alphaList.clear();
oldAlpha = rs.getDouble(alphaFieldName);
for(double freq : propagationProcessPathDataDay.freq_lvl_exact) {
for(double freq : attenuationCnossosParametersDay.freq_lvl_exact) {
alphaList.add(getWallAlpha(oldAlpha, freq));
}
}
Expand Down
12 changes: 6 additions & 6 deletions ...modelling-jdbc/src/main/java/org/noise_planet/noisemodelling/jdbc/LDENComputeRaysOut.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import org.noise_planet.noisemodelling.pathfinder.IComputeRaysOut;
import org.noise_planet.noisemodelling.pathfinder.PropagationPath;
import org.noise_planet.noisemodelling.pathfinder.utils.PowerUtils;
import org.noise_planet.noisemodelling.propagation.AttenuationCnossosParameters;
import org.noise_planet.noisemodelling.propagation.ComputeRaysOutAttenuation;
import org.noise_planet.noisemodelling.propagation.PropagationProcessPathData;

import java.util.ArrayList;
import java.util.Collection;
Expand All @@ -20,13 +20,13 @@
public class LDENComputeRaysOut extends ComputeRaysOutAttenuation {
LdenData ldenData;
LDENPropagationProcessData ldenPropagationProcessData;
public PropagationProcessPathData dayPathData;
public PropagationProcessPathData eveningPathData;
public PropagationProcessPathData nightPathData;
public AttenuationCnossosParameters dayPathData;
public AttenuationCnossosParameters eveningPathData;
public AttenuationCnossosParameters nightPathData;
public LDENConfig ldenConfig;

public LDENComputeRaysOut(PropagationProcessPathData dayPathData, PropagationProcessPathData eveningPathData,
PropagationProcessPathData nightPathData, LDENPropagationProcessData inputData,
public LDENComputeRaysOut(AttenuationCnossosParameters dayPathData, AttenuationCnossosParameters eveningPathData,
AttenuationCnossosParameters nightPathData, LDENPropagationProcessData inputData,
LdenData ldenData, LDENConfig ldenConfig) {
super(inputData.ldenConfig.exportRaysMethod != LDENConfig.ExportRaysMethods.NONE, null, inputData);
this.keepAbsorption = inputData.ldenConfig.keepAbsorption;
Expand Down
25 changes: 12 additions & 13 deletions noisemodelling-jdbc/src/main/java/org/noise_planet/noisemodelling/jdbc/LDENConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@
*/
package org.noise_planet.noisemodelling.jdbc;

import org.noise_planet.noisemodelling.propagation.PropagationProcessPathData;
import org.noise_planet.noisemodelling.propagation.AttenuationCnossosParameters;

import java.io.File;
import java.util.concurrent.atomic.AtomicInteger;

/**
* Configuration of NoiseModelling computation based on database data using standard Lden outputs
Expand All @@ -35,9 +34,9 @@ public enum INPUT_MODE { INPUT_MODE_TRAFFIC_FLOW, INPUT_MODE_LW_DEN, INPUT_MODE_
final INPUT_MODE input_mode;

// This field is initialised when {@link PointNoiseMap#initialize} is called
PropagationProcessPathData propagationProcessPathDataDay = null;
PropagationProcessPathData propagationProcessPathDataEvening = null;
PropagationProcessPathData propagationProcessPathDataNight = null;
AttenuationCnossosParameters attenuationCnossosParametersDay = null;
AttenuationCnossosParameters attenuationCnossosParametersEvening = null;
AttenuationCnossosParameters attenuationCnossosParametersNight = null;

// Cnossos revisions have multiple coefficients for road emission formulae
// this parameter will be removed when the final version of Cnossos will be published
Expand Down Expand Up @@ -93,14 +92,14 @@ public LDENConfig(INPUT_MODE input_mode) {
}


public PropagationProcessPathData getPropagationProcessPathData(TIME_PERIOD time_period) {
public AttenuationCnossosParameters getPropagationProcessPathData(TIME_PERIOD time_period) {
switch (time_period) {
case DAY:
return propagationProcessPathDataDay;
return attenuationCnossosParametersDay;
case EVENING:
return propagationProcessPathDataEvening;
return attenuationCnossosParametersEvening;
default:
return propagationProcessPathDataNight;
return attenuationCnossosParametersNight;
}
}

Expand All @@ -118,14 +117,14 @@ public void setMaximumRaysOutputCount(int maximumRaysOutputCount) {
this.maximumRaysOutputCount = maximumRaysOutputCount;
}

public void setPropagationProcessPathData(TIME_PERIOD time_period, PropagationProcessPathData propagationProcessPathData) {
public void setPropagationProcessPathData(TIME_PERIOD time_period, AttenuationCnossosParameters attenuationCnossosParameters) {
switch (time_period) {
case DAY:
propagationProcessPathDataDay = propagationProcessPathData;
attenuationCnossosParametersDay = attenuationCnossosParameters;
case EVENING:
propagationProcessPathDataEvening = propagationProcessPathData;
attenuationCnossosParametersEvening = attenuationCnossosParameters;
default:
propagationProcessPathDataNight = propagationProcessPathData;
attenuationCnossosParametersNight = attenuationCnossosParameters;
}
}

Expand Down
30 changes: 15 additions & 15 deletions ...ing-jdbc/src/main/java/org/noise_planet/noisemodelling/jdbc/LDENPointNoiseMapFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import org.noise_planet.noisemodelling.jdbc.utils.StringPreparedStatements;
import org.noise_planet.noisemodelling.pathfinder.*;
import org.noise_planet.noisemodelling.pathfinder.utils.ProfilerThread;
import org.noise_planet.noisemodelling.propagation.AttenuationCnossosParameters;
import org.noise_planet.noisemodelling.propagation.ComputeRaysOutAttenuation;
import org.noise_planet.noisemodelling.propagation.PropagationProcessPathData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -147,9 +147,9 @@ public void initialize(Connection connection, PointNoiseMap pointNoiseMap) throw
// Instance of PropagationProcessPathData maybe already set
for(LDENConfig.TIME_PERIOD timePeriod : LDENConfig.TIME_PERIOD.values()) {
if (pointNoiseMap.getPropagationProcessPathData(timePeriod) == null) {
PropagationProcessPathData propagationProcessPathData = new PropagationProcessPathData(frequencyValues, exactFrequencies, aWeighting);
ldenConfig.setPropagationProcessPathData(timePeriod, propagationProcessPathData);
pointNoiseMap.setPropagationProcessPathData(timePeriod, propagationProcessPathData);
AttenuationCnossosParameters attenuationCnossosParameters = new AttenuationCnossosParameters(frequencyValues, exactFrequencies, aWeighting);
ldenConfig.setPropagationProcessPathData(timePeriod, attenuationCnossosParameters);
pointNoiseMap.setPropagationProcessPathData(timePeriod, attenuationCnossosParameters);
} else {
pointNoiseMap.getPropagationProcessPathData(timePeriod).setFrequencies(frequencyValues);
pointNoiseMap.getPropagationProcessPathData(timePeriod).setFrequenciesExact(exactFrequencies);
Expand All @@ -161,9 +161,9 @@ public void initialize(Connection connection, PointNoiseMap pointNoiseMap) throw
for(LDENConfig.TIME_PERIOD timePeriod : LDENConfig.TIME_PERIOD.values()) {
if (pointNoiseMap.getPropagationProcessPathData(timePeriod) == null) {
// Traffic flow cnossos frequencies are octave bands from 63 to 8000 Hz
PropagationProcessPathData propagationProcessPathData = new PropagationProcessPathData(false);
ldenConfig.setPropagationProcessPathData(timePeriod, propagationProcessPathData);
pointNoiseMap.setPropagationProcessPathData(timePeriod, propagationProcessPathData);
AttenuationCnossosParameters attenuationCnossosParameters = new AttenuationCnossosParameters(false);
ldenConfig.setPropagationProcessPathData(timePeriod, attenuationCnossosParameters);
pointNoiseMap.setPropagationProcessPathData(timePeriod, attenuationCnossosParameters);
} else {
ldenConfig.setPropagationProcessPathData(timePeriod, pointNoiseMap.getPropagationProcessPathData(timePeriod));
}
Expand Down Expand Up @@ -230,8 +230,8 @@ public LDENPropagationProcessData create(ProfileBuilder builder) {
}

@Override
public IComputeRaysOut create(CnossosPropagationData threadData, PropagationProcessPathData pathDataDay,
PropagationProcessPathData pathDataEvening, PropagationProcessPathData pathDataNight) {
public IComputeRaysOut create(CnossosPropagationData threadData, AttenuationCnossosParameters pathDataDay,
AttenuationCnossosParameters pathDataEvening, AttenuationCnossosParameters pathDataNight) {
return new LDENComputeRaysOut(pathDataDay, pathDataEvening, pathDataNight,
(LDENPropagationProcessData)threadData, ldenData, ldenConfig);
}
Expand All @@ -252,9 +252,9 @@ public TableWriter(Connection connection, LDENConfig ldenConfig, LDENComputeRays
this.sqlFilePath = ldenConfig.sqlOutputFile;
this.ldenConfig = ldenConfig;
this.ldenData = ldenData;
a_weighting = new double[ldenConfig.propagationProcessPathDataDay.freq_lvl_a_weighting.size()];
a_weighting = new double[ldenConfig.attenuationCnossosParametersDay.freq_lvl_a_weighting.size()];
for(int idfreq = 0; idfreq < a_weighting.length; idfreq++) {
a_weighting[idfreq] = ldenConfig.propagationProcessPathDataDay.freq_lvl_a_weighting.get(idfreq);
a_weighting[idfreq] = ldenConfig.attenuationCnossosParametersDay.freq_lvl_a_weighting.get(idfreq);
}
this.srid = srid;
}
Expand Down Expand Up @@ -335,7 +335,7 @@ void processStack(String tableName, ConcurrentLinkedDeque<ComputeRaysOutAttenuat
query.append(", ?"); // ID_SOURCE
}
if (!ldenConfig.computeLAEQOnly) {
query.append(", ?".repeat(ldenConfig.propagationProcessPathDataDay.freq_lvl.size())); // freq value
query.append(", ?".repeat(ldenConfig.attenuationCnossosParametersDay.freq_lvl.size())); // freq value
query.append(", ?, ?);"); // laeq, leq
}else{
query.append(", ?);"); // laeq, leq
Expand All @@ -357,7 +357,7 @@ void processStack(String tableName, ConcurrentLinkedDeque<ComputeRaysOutAttenuat
}

if (!ldenConfig.computeLAEQOnly){
for(int idfreq=0;idfreq < ldenConfig.propagationProcessPathDataDay.freq_lvl.size(); idfreq++) {
for(int idfreq = 0; idfreq < ldenConfig.attenuationCnossosParametersDay.freq_lvl.size(); idfreq++) {
double value = row.value[idfreq];
if(!Double.isFinite(value)) {
value = -99.0;
Expand Down Expand Up @@ -405,9 +405,9 @@ private String forgeCreateTable(String tableName) {
sb.append(", LAEQ REAL");
sb.append(");");
} else {
for (int idfreq = 0; idfreq < ldenConfig.propagationProcessPathDataDay.freq_lvl.size(); idfreq++) {
for (int idfreq = 0; idfreq < ldenConfig.attenuationCnossosParametersDay.freq_lvl.size(); idfreq++) {
sb.append(", HZ");
sb.append(ldenConfig.propagationProcessPathDataDay.freq_lvl.get(idfreq));
sb.append(ldenConfig.attenuationCnossosParametersDay.freq_lvl.get(idfreq));
sb.append(" REAL");
}
sb.append(", LAEQ REAL, LEQ REAL");
Expand Down