better name for the package

matsim-org · Mar 18, 2024 · 9e3e24f · 9e3e24f
1 parent 123704e
commit 9e3e24f
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 34 deletions.
diff --git a/...epare/network/opt/ApplyNetworkParams.java → ...re/network/params/ApplyNetworkParams.java b/...epare/network/opt/ApplyNetworkParams.java → ...re/network/params/ApplyNetworkParams.java
@@ -1,4 +1,4 @@
-package org.matsim.application.prepare.network.opt;
+package org.matsim.application.prepare.network.params;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -14,7 +14,7 @@
 import org.matsim.application.MATSimAppCommand;
 import org.matsim.application.options.InputOptions;
 import org.matsim.application.options.OutputOptions;
-import org.matsim.application.prepare.network.opt.NetworkParamsOpt.Feature;
+import org.matsim.application.prepare.network.params.NetworkParamsOpt.Feature;
 import org.matsim.core.network.NetworkUtils;
 import org.matsim.core.utils.io.IOUtils;
 import picocli.CommandLine;

diff --git a/...pare/network/opt/EvalFreespeedParams.java → ...e/network/params/EvalFreespeedParams.java b/...pare/network/opt/EvalFreespeedParams.java → ...e/network/params/EvalFreespeedParams.java
@@ -1,4 +1,4 @@
-package org.matsim.application.prepare.network.opt;
+package org.matsim.application.prepare.network.params;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.matsim.application.prepare.network.opt.NetworkParamsOpt.*;
+import static org.matsim.application.prepare.network.params.NetworkParamsOpt.*;
 
 @CommandLine.Command(
 	name = "eval-network-params", description = "Evaluate network params"

diff --git a/...prepare/network/opt/FeatureRegressor.java → ...pare/network/params/FeatureRegressor.java b/...prepare/network/opt/FeatureRegressor.java → ...pare/network/params/FeatureRegressor.java
@@ -1,4 +1,4 @@
-package org.matsim.application.prepare.network.opt;
+package org.matsim.application.prepare.network.params;
 
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 

diff --git a/...epare/network/opt/FreespeedOptServer.java → ...re/network/params/FreespeedOptServer.java b/...epare/network/opt/FreespeedOptServer.java → ...re/network/params/FreespeedOptServer.java
@@ -1,4 +1,4 @@
-package org.matsim.application.prepare.network.opt;
+package org.matsim.application.prepare.network.params;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -22,8 +22,8 @@
 import org.matsim.application.MATSimAppCommand;
 import org.matsim.application.analysis.traffic.traveltime.SampleValidationRoutes;
 import org.matsim.application.options.InputOptions;
-import org.matsim.application.prepare.network.opt.NetworkParamsOpt.Feature;
-import org.matsim.application.prepare.network.opt.NetworkParamsOpt.Result;
+import org.matsim.application.prepare.network.params.NetworkParamsOpt.Feature;
+import org.matsim.application.prepare.network.params.NetworkParamsOpt.Result;
 import picocli.CommandLine;
 
 import java.io.IOException;

diff --git a/...prepare/network/opt/NetworkAttribute.java → ...pare/network/params/NetworkAttribute.java b/...prepare/network/opt/NetworkAttribute.java → ...pare/network/params/NetworkAttribute.java
@@ -1,4 +1,4 @@
-package org.matsim.application.prepare.network.opt;
+package org.matsim.application.prepare.network.params;
 
 /**
  * Enum of network parameters.

diff --git a/...ion/prepare/network/opt/NetworkModel.java → .../prepare/network/params/NetworkModel.java b/...ion/prepare/network/opt/NetworkModel.java → .../prepare/network/params/NetworkModel.java
@@ -1,4 +1,4 @@
-package org.matsim.application.prepare.network.opt;
+package org.matsim.application.prepare.network.params;
 
 /**
  * A model for estimating network parameters.

diff --git a/...on/prepare/network/opt/NetworkParams.java → ...prepare/network/params/NetworkParams.java b/...on/prepare/network/opt/NetworkParams.java → ...prepare/network/params/NetworkParams.java
@@ -1,4 +1,4 @@
-package org.matsim.application.prepare.network.opt;
+package org.matsim.application.prepare.network.params;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;

diff --git a/...prepare/network/opt/NetworkParamsOpt.java → ...pare/network/params/NetworkParamsOpt.java b/...prepare/network/opt/NetworkParamsOpt.java → ...pare/network/params/NetworkParamsOpt.java
@@ -1,4 +1,4 @@
-package org.matsim.application.prepare.network.opt;
+package org.matsim.application.prepare.network.params;
 
 import it.unimi.dsi.fastutil.doubles.DoubleList;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;

diff --git a/...e/network/opt/ref/DecisionTreeParams.java → ...etwork/params/ref/DecisionTreeParams.java b/...e/network/opt/ref/DecisionTreeParams.java → ...etwork/params/ref/DecisionTreeParams.java
@@ -1,11 +1,11 @@
-package org.matsim.application.prepare.network.opt.ref;
+package org.matsim.application.prepare.network.params.ref;
 
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
-import org.matsim.application.prepare.network.opt.FeatureRegressor;
-import org.matsim.application.prepare.network.opt.NetworkModel;
+import org.matsim.application.prepare.network.params.FeatureRegressor;
+import org.matsim.application.prepare.network.params.NetworkModel;
 
 /**
- * Reference model with a manual combining decision tree using priority, road type and speed.
+ * Reference model with a manually defined decision tree using priority, road type and speed.
  */
 public final class DecisionTreeParams implements NetworkModel {
 

diff --git a/...network/opt/ref/GermanyNetworkParams.java → ...work/params/ref/GermanyNetworkParams.java b/...network/opt/ref/GermanyNetworkParams.java → ...work/params/ref/GermanyNetworkParams.java
@@ -1,7 +1,7 @@
-package org.matsim.application.prepare.network.opt.ref;
+package org.matsim.application.prepare.network.params.ref;
 
-import org.matsim.application.prepare.network.opt.FeatureRegressor;
-import org.matsim.application.prepare.network.opt.NetworkModel;
+import org.matsim.application.prepare.network.params.FeatureRegressor;
+import org.matsim.application.prepare.network.params.NetworkModel;
 
 /**
  * Model trained on three region types in germany (metropole, city, rural).

diff --git a/...rmanyNetworkParams_capacity_dead_end.java → ...rmanyNetworkParams_capacity_dead_end.java b/...rmanyNetworkParams_capacity_dead_end.java → ...rmanyNetworkParams_capacity_dead_end.java
@@ -1,5 +1,5 @@
-package org.matsim.application.prepare.network.opt.ref;
-import org.matsim.application.prepare.network.opt.FeatureRegressor;
+package org.matsim.application.prepare.network.params.ref;
+import org.matsim.application.prepare.network.params.FeatureRegressor;
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 
 /**

diff --git a/...rmanyNetworkParams_capacity_priority.java → ...rmanyNetworkParams_capacity_priority.java b/...rmanyNetworkParams_capacity_priority.java → ...rmanyNetworkParams_capacity_priority.java
@@ -1,5 +1,5 @@
-package org.matsim.application.prepare.network.opt.ref;
-import org.matsim.application.prepare.network.opt.FeatureRegressor;
+package org.matsim.application.prepare.network.params.ref;
+import org.matsim.application.prepare.network.params.FeatureRegressor;
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 
 /**

diff --git a/...orkParams_capacity_right_before_left.java → ...orkParams_capacity_right_before_left.java b/...orkParams_capacity_right_before_left.java → ...orkParams_capacity_right_before_left.java
@@ -1,5 +1,5 @@
-package org.matsim.application.prepare.network.opt.ref;
-import org.matsim.application.prepare.network.opt.FeatureRegressor;
+package org.matsim.application.prepare.network.params.ref;
+import org.matsim.application.prepare.network.params.FeatureRegressor;
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 
 /**

diff --git a/...NetworkParams_capacity_traffic_light.java → ...NetworkParams_capacity_traffic_light.java b/...NetworkParams_capacity_traffic_light.java → ...NetworkParams_capacity_traffic_light.java
@@ -1,5 +1,5 @@
-package org.matsim.application.prepare.network.opt.ref;
-import org.matsim.application.prepare.network.opt.FeatureRegressor;
+package org.matsim.application.prepare.network.params.ref;
+import org.matsim.application.prepare.network.params.FeatureRegressor;
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 
 /**

diff --git a/...NetworkParams_speedRelative_priority.java → ...NetworkParams_speedRelative_priority.java b/...NetworkParams_speedRelative_priority.java → ...NetworkParams_speedRelative_priority.java
@@ -1,5 +1,5 @@
-package org.matsim.application.prepare.network.opt.ref;
-import org.matsim.application.prepare.network.opt.FeatureRegressor;
+package org.matsim.application.prepare.network.params.ref;
+import org.matsim.application.prepare.network.params.FeatureRegressor;
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 
 /**

diff --git a/...rams_speedRelative_right_before_left.java → ...rams_speedRelative_right_before_left.java b/...rams_speedRelative_right_before_left.java → ...rams_speedRelative_right_before_left.java
@@ -1,5 +1,5 @@
-package org.matsim.application.prepare.network.opt.ref;
-import org.matsim.application.prepare.network.opt.FeatureRegressor;
+package org.matsim.application.prepare.network.params.ref;
+import org.matsim.application.prepare.network.params.FeatureRegressor;
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 
 /**

diff --git a/...rkParams_speedRelative_traffic_light.java → ...rkParams_speedRelative_traffic_light.java b/...rkParams_speedRelative_traffic_light.java → ...rkParams_speedRelative_traffic_light.java
@@ -1,5 +1,5 @@
-package org.matsim.application.prepare.network.opt.ref;
-import org.matsim.application.prepare.network.opt.FeatureRegressor;
+package org.matsim.application.prepare.network.params.ref;
+import org.matsim.application.prepare.network.params.FeatureRegressor;
 import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
 
 /**

diff --git a/...e/network/opt/ApplyNetworkParamsTest.java → ...etwork/params/ApplyNetworkParamsTest.java b/...e/network/opt/ApplyNetworkParamsTest.java → ...etwork/params/ApplyNetworkParamsTest.java
@@ -1,4 +1,4 @@
-package org.matsim.application.prepare.network.opt;
+package org.matsim.application.prepare.network.params;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;

diff --git a/...plication/prepare/network/opt/osm.net.xml → ...cation/prepare/network/params/osm.net.xml b/...plication/prepare/network/opt/osm.net.xml → ...cation/prepare/network/params/osm.net.xml