diff --git a/README.md b/README.md index cc6cf91..ed03489 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Model Elements Library -Generates a java lib in ModelElements.jar that can be used for networks and their elements, data profiles, scenarios, and so on. These classes are very lightweight and can be used as mock classes in testing. They also can be serialized (binary or json) via avro. +Generates a java lib in model-elements.jar that can be used for networks and their elements, data profiles, scenarios, and so on. These classes are very lightweight and can be used as mock classes in testing. They also can be serialized (binary or json) via avro. See the tests for some examples. diff --git a/pom.xml b/pom.xml index 66f8724..b990b47 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 edu.berkeley.path - ModelElements + model-elements jar 0.1-SNAPSHOT diff --git a/rakefile b/rakefile index 0c56b7a..c7e87b9 100644 --- a/rakefile +++ b/rakefile @@ -10,7 +10,7 @@ end desc "clean up after avro-maven-plugin" task :clean do - rm_rf "src/main/java/edu/berkeley/path/ModelElements" + rm_rf "src/main/java/edu/berkeley/path/model-elements" end task :avro_help do diff --git a/src/main/avro/ModelElements.avdl b/src/main/avro/model-elements.avdl similarity index 98% rename from src/main/avro/ModelElements.avdl rename to src/main/avro/model-elements.avdl index 0531b9e..4a6fd3a 100644 --- a/src/main/avro/ModelElements.avdl +++ b/src/main/avro/model-elements.avdl @@ -27,14 +27,14 @@ * SUCH DAMAGE. */ -@namespace("edu.berkeley.path.ModelElements") +@namespace("edu.berkeley.path.model_elements") /** * Description of the config and state of our networks and related data. * * Note: all units in SI (meters, seconds, etc.) except where specified. */ -protocol ModelElements { +protocol model_elements { /** seconds and milliseconds, can be absolute or relative (when absolute: since epoch, utc) */ diff --git a/src/main/java/edu/berkeley/path/ModelElements/ModelElements.java b/src/main/java/edu/berkeley/path/ModelElements/ModelElements.java deleted file mode 100644 index eb50661..0000000 --- a/src/main/java/edu/berkeley/path/ModelElements/ModelElements.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Autogenerated by Avro - * - * DO NOT EDIT DIRECTLY - */ -package edu.berkeley.path.ModelElements; - -@SuppressWarnings("all") -/** * Description of the config and state of our networks and related data. - * - * Note: all units in SI (meters, seconds, etc.) except where specified. */ -public interface ModelElements { - public static final org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse("{\"protocol\":\"ModelElements\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"doc\":\"* Description of the config and state of our networks and related data.\\n *\\n * Note: all units in SI (meters, seconds, etc.) except where specified.\",\"types\":[{\"type\":\"record\",\"name\":\"Time\",\"doc\":\"seconds and milliseconds, can be absolute or relative\\n (when absolute: since epoch, utc)\",\"fields\":[{\"name\":\"seconds\",\"type\":\"long\"},{\"name\":\"milliseconds\",\"type\":\"long\"}]},{\"type\":\"record\",\"name\":\"NodeRef\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"LinkRef\",\"fields\":[{\"name\":\"linkId\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"NetworkRef\",\"fields\":[{\"name\":\"networkId\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Node\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Link\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"},{\"name\":\"laneCount\",\"type\":\"double\"},{\"name\":\"length\",\"type\":\"double\"},{\"name\":\"laneOffset\",\"type\":\"int\",\"default\":0},{\"name\":\"begin\",\"type\":\"NodeRef\"},{\"name\":\"end\",\"type\":\"NodeRef\"}]},{\"type\":\"record\",\"name\":\"Network\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"default\":\"1\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"nodes\",\"type\":{\"type\":\"array\",\"items\":\"Node\"},\"default\":[]},{\"name\":\"links\",\"type\":{\"type\":\"array\",\"items\":\"Link\"},\"default\":[]}]},{\"type\":\"record\",\"name\":\"DensityProfile\",\"doc\":\"Density on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"vehiclesPerMeter\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"SpeedProfile\",\"doc\":\"Speed on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"metersPerSecond\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"FD\",\"doc\":\"Fundamental diagram on one link at one time\",\"fields\":[{\"name\":\"freeFlowSpeed\",\"type\":\"double\"},{\"name\":\"freeFlowSpeedStdev\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeed\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeedStdev\",\"type\":\"double\"},{\"name\":\"capacity\",\"type\":\"double\"},{\"name\":\"capacityStdev\",\"type\":\"double\"},{\"name\":\"jamDensity\",\"type\":\"double\"},{\"name\":\"capacityDrop\",\"type\":\"double\"}]},{\"type\":\"record\",\"name\":\"FDProfile\",\"doc\":\"Fundamental diagrams on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"fd\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"FD\"}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"DemandProfile\",\"doc\":\"Demands on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"origin\",\"type\":\"LinkRef\",\"doc\":\"may not be null\"},{\"name\":\"destination\",\"type\":\"LinkRef\",\"doc\":\"may be null\"},{\"name\":\"demand\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"Scenario\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"network\",\"type\":\"Network\"},{\"name\":\"initialDensityProfile\",\"type\":\"DensityProfile\"},{\"name\":\"fdProfile\",\"type\":\"FDProfile\"},{\"name\":\"demandProfile\",\"type\":\"DemandProfile\"}]}],\"messages\":{}}"); - - @SuppressWarnings("all") - /** * Description of the config and state of our networks and related data. - * - * Note: all units in SI (meters, seconds, etc.) except where specified. */ - public interface Callback extends ModelElements { - public static final org.apache.avro.Protocol PROTOCOL = edu.berkeley.path.ModelElements.ModelElements.PROTOCOL; - } -} \ No newline at end of file diff --git a/src/main/java/edu/berkeley/path/ModelElements/DemandProfile.java b/src/main/java/edu/berkeley/path/model_elements/DemandProfile.java similarity index 68% rename from src/main/java/edu/berkeley/path/ModelElements/DemandProfile.java rename to src/main/java/edu/berkeley/path/model_elements/DemandProfile.java index 86f25a9..0edc80f 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/DemandProfile.java +++ b/src/main/java/edu/berkeley/path/model_elements/DemandProfile.java @@ -3,17 +3,17 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") /** Demands on each link as time series */ public class DemandProfile extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DemandProfile\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"doc\":\"Demands on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"origin\",\"type\":{\"type\":\"record\",\"name\":\"LinkRef\",\"fields\":[{\"name\":\"linkId\",\"type\":\"string\"}]},\"doc\":\"may not be null\"},{\"name\":\"destination\",\"type\":\"LinkRef\",\"doc\":\"may be null\"},{\"name\":\"demand\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DemandProfile\",\"namespace\":\"edu.berkeley.path.model_elements\",\"doc\":\"Demands on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"origin\",\"type\":{\"type\":\"record\",\"name\":\"LinkRef\",\"fields\":[{\"name\":\"linkId\",\"type\":\"string\"}]},\"doc\":\"may not be null\"},{\"name\":\"destination\",\"type\":\"LinkRef\",\"doc\":\"may be null\"},{\"name\":\"demand\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]}"); @Deprecated public double dt; @Deprecated public double startTime; /** may not be null */ - @Deprecated public edu.berkeley.path.ModelElements.LinkRef origin; + @Deprecated public edu.berkeley.path.model_elements.LinkRef origin; /** may be null */ - @Deprecated public edu.berkeley.path.ModelElements.LinkRef destination; + @Deprecated public edu.berkeley.path.model_elements.LinkRef destination; /** map key is linkId, array is time series, as per dt and startTime. */ @Deprecated public java.util.Map> demand; public org.apache.avro.Schema getSchema() { return SCHEMA$; } @@ -34,8 +34,8 @@ public void put(int field$, java.lang.Object value$) { switch (field$) { case 0: dt = (java.lang.Double)value$; break; case 1: startTime = (java.lang.Double)value$; break; - case 2: origin = (edu.berkeley.path.ModelElements.LinkRef)value$; break; - case 3: destination = (edu.berkeley.path.ModelElements.LinkRef)value$; break; + case 2: origin = (edu.berkeley.path.model_elements.LinkRef)value$; break; + case 3: destination = (edu.berkeley.path.model_elements.LinkRef)value$; break; case 4: demand = (java.util.Map>)value$; break; default: throw new org.apache.avro.AvroRuntimeException("Bad index"); } @@ -74,7 +74,7 @@ public void setStartTime(java.lang.Double value) { /** * Gets the value of the 'origin' field. * may not be null */ - public edu.berkeley.path.ModelElements.LinkRef getOrigin() { + public edu.berkeley.path.model_elements.LinkRef getOrigin() { return origin; } @@ -82,14 +82,14 @@ public edu.berkeley.path.ModelElements.LinkRef getOrigin() { * Sets the value of the 'origin' field. * may not be null * @param value the value to set. */ - public void setOrigin(edu.berkeley.path.ModelElements.LinkRef value) { + public void setOrigin(edu.berkeley.path.model_elements.LinkRef value) { this.origin = value; } /** * Gets the value of the 'destination' field. * may be null */ - public edu.berkeley.path.ModelElements.LinkRef getDestination() { + public edu.berkeley.path.model_elements.LinkRef getDestination() { return destination; } @@ -97,7 +97,7 @@ public edu.berkeley.path.ModelElements.LinkRef getDestination() { * Sets the value of the 'destination' field. * may be null * @param value the value to set. */ - public void setDestination(edu.berkeley.path.ModelElements.LinkRef value) { + public void setDestination(edu.berkeley.path.model_elements.LinkRef value) { this.destination = value; } @@ -117,18 +117,18 @@ public void setDemand(java.util.Map> demand; /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.DemandProfile.SCHEMA$); + super(edu.berkeley.path.model_elements.DemandProfile.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.DemandProfile.Builder other) { + private Builder(edu.berkeley.path.model_elements.DemandProfile.Builder other) { super(other); } /** Creates a Builder by copying an existing DemandProfile instance */ - private Builder(edu.berkeley.path.ModelElements.DemandProfile other) { - super(edu.berkeley.path.ModelElements.DemandProfile.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.DemandProfile other) { + super(edu.berkeley.path.model_elements.DemandProfile.SCHEMA$); if (isValidValue(fields()[0], other.dt)) { this.dt = (java.lang.Double) data().deepCopy(fields()[0].schema(), other.dt); fieldSetFlags()[0] = true; @@ -165,11 +165,11 @@ private Builder(edu.berkeley.path.ModelElements.DemandProfile other) { fieldSetFlags()[1] = true; } if (isValidValue(fields()[2], other.origin)) { - this.origin = (edu.berkeley.path.ModelElements.LinkRef) data().deepCopy(fields()[2].schema(), other.origin); + this.origin = (edu.berkeley.path.model_elements.LinkRef) data().deepCopy(fields()[2].schema(), other.origin); fieldSetFlags()[2] = true; } if (isValidValue(fields()[3], other.destination)) { - this.destination = (edu.berkeley.path.ModelElements.LinkRef) data().deepCopy(fields()[3].schema(), other.destination); + this.destination = (edu.berkeley.path.model_elements.LinkRef) data().deepCopy(fields()[3].schema(), other.destination); fieldSetFlags()[3] = true; } if (isValidValue(fields()[4], other.demand)) { @@ -184,7 +184,7 @@ public java.lang.Double getDt() { } /** Sets the value of the 'dt' field */ - public edu.berkeley.path.ModelElements.DemandProfile.Builder setDt(double value) { + public edu.berkeley.path.model_elements.DemandProfile.Builder setDt(double value) { validate(fields()[0], value); this.dt = value; fieldSetFlags()[0] = true; @@ -197,7 +197,7 @@ public boolean hasDt() { } /** Clears the value of the 'dt' field */ - public edu.berkeley.path.ModelElements.DemandProfile.Builder clearDt() { + public edu.berkeley.path.model_elements.DemandProfile.Builder clearDt() { fieldSetFlags()[0] = false; return this; } @@ -208,7 +208,7 @@ public java.lang.Double getStartTime() { } /** Sets the value of the 'startTime' field */ - public edu.berkeley.path.ModelElements.DemandProfile.Builder setStartTime(double value) { + public edu.berkeley.path.model_elements.DemandProfile.Builder setStartTime(double value) { validate(fields()[1], value); this.startTime = value; fieldSetFlags()[1] = true; @@ -221,18 +221,18 @@ public boolean hasStartTime() { } /** Clears the value of the 'startTime' field */ - public edu.berkeley.path.ModelElements.DemandProfile.Builder clearStartTime() { + public edu.berkeley.path.model_elements.DemandProfile.Builder clearStartTime() { fieldSetFlags()[1] = false; return this; } /** Gets the value of the 'origin' field */ - public edu.berkeley.path.ModelElements.LinkRef getOrigin() { + public edu.berkeley.path.model_elements.LinkRef getOrigin() { return origin; } /** Sets the value of the 'origin' field */ - public edu.berkeley.path.ModelElements.DemandProfile.Builder setOrigin(edu.berkeley.path.ModelElements.LinkRef value) { + public edu.berkeley.path.model_elements.DemandProfile.Builder setOrigin(edu.berkeley.path.model_elements.LinkRef value) { validate(fields()[2], value); this.origin = value; fieldSetFlags()[2] = true; @@ -245,19 +245,19 @@ public boolean hasOrigin() { } /** Clears the value of the 'origin' field */ - public edu.berkeley.path.ModelElements.DemandProfile.Builder clearOrigin() { + public edu.berkeley.path.model_elements.DemandProfile.Builder clearOrigin() { origin = null; fieldSetFlags()[2] = false; return this; } /** Gets the value of the 'destination' field */ - public edu.berkeley.path.ModelElements.LinkRef getDestination() { + public edu.berkeley.path.model_elements.LinkRef getDestination() { return destination; } /** Sets the value of the 'destination' field */ - public edu.berkeley.path.ModelElements.DemandProfile.Builder setDestination(edu.berkeley.path.ModelElements.LinkRef value) { + public edu.berkeley.path.model_elements.DemandProfile.Builder setDestination(edu.berkeley.path.model_elements.LinkRef value) { validate(fields()[3], value); this.destination = value; fieldSetFlags()[3] = true; @@ -270,7 +270,7 @@ public boolean hasDestination() { } /** Clears the value of the 'destination' field */ - public edu.berkeley.path.ModelElements.DemandProfile.Builder clearDestination() { + public edu.berkeley.path.model_elements.DemandProfile.Builder clearDestination() { destination = null; fieldSetFlags()[3] = false; return this; @@ -282,7 +282,7 @@ public java.util.Map> ge } /** Sets the value of the 'demand' field */ - public edu.berkeley.path.ModelElements.DemandProfile.Builder setDemand(java.util.Map> value) { + public edu.berkeley.path.model_elements.DemandProfile.Builder setDemand(java.util.Map> value) { validate(fields()[4], value); this.demand = value; fieldSetFlags()[4] = true; @@ -295,7 +295,7 @@ public boolean hasDemand() { } /** Clears the value of the 'demand' field */ - public edu.berkeley.path.ModelElements.DemandProfile.Builder clearDemand() { + public edu.berkeley.path.model_elements.DemandProfile.Builder clearDemand() { demand = null; fieldSetFlags()[4] = false; return this; @@ -307,8 +307,8 @@ public DemandProfile build() { DemandProfile record = new DemandProfile(); record.dt = fieldSetFlags()[0] ? this.dt : (java.lang.Double) defaultValue(fields()[0]); record.startTime = fieldSetFlags()[1] ? this.startTime : (java.lang.Double) defaultValue(fields()[1]); - record.origin = fieldSetFlags()[2] ? this.origin : (edu.berkeley.path.ModelElements.LinkRef) defaultValue(fields()[2]); - record.destination = fieldSetFlags()[3] ? this.destination : (edu.berkeley.path.ModelElements.LinkRef) defaultValue(fields()[3]); + record.origin = fieldSetFlags()[2] ? this.origin : (edu.berkeley.path.model_elements.LinkRef) defaultValue(fields()[2]); + record.destination = fieldSetFlags()[3] ? this.destination : (edu.berkeley.path.model_elements.LinkRef) defaultValue(fields()[3]); record.demand = fieldSetFlags()[4] ? this.demand : (java.util.Map>) defaultValue(fields()[4]); return record; } catch (Exception e) { diff --git a/src/main/java/edu/berkeley/path/ModelElements/DensityProfile.java b/src/main/java/edu/berkeley/path/model_elements/DensityProfile.java similarity index 75% rename from src/main/java/edu/berkeley/path/ModelElements/DensityProfile.java rename to src/main/java/edu/berkeley/path/model_elements/DensityProfile.java index 25ce3a2..f20bc16 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/DensityProfile.java +++ b/src/main/java/edu/berkeley/path/model_elements/DensityProfile.java @@ -3,11 +3,11 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") /** Density on each link and cell at a point in time */ public class DensityProfile extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DensityProfile\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"doc\":\"Density on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"vehiclesPerMeter\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DensityProfile\",\"namespace\":\"edu.berkeley.path.model_elements\",\"doc\":\"Density on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"vehiclesPerMeter\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]}"); @Deprecated public java.lang.CharSequence id; /** map key is linkId */ @Deprecated public java.util.Map> vehiclesPerMeter; @@ -61,18 +61,18 @@ public void setVehiclesPerMeter(java.util.Map> ge } /** Sets the value of the 'vehiclesPerMeter' field */ - public edu.berkeley.path.ModelElements.DensityProfile.Builder setVehiclesPerMeter(java.util.Map> value) { + public edu.berkeley.path.model_elements.DensityProfile.Builder setVehiclesPerMeter(java.util.Map> value) { validate(fields()[1], value); this.vehiclesPerMeter = value; fieldSetFlags()[1] = true; @@ -151,7 +151,7 @@ public boolean hasVehiclesPerMeter() { } /** Clears the value of the 'vehiclesPerMeter' field */ - public edu.berkeley.path.ModelElements.DensityProfile.Builder clearVehiclesPerMeter() { + public edu.berkeley.path.model_elements.DensityProfile.Builder clearVehiclesPerMeter() { vehiclesPerMeter = null; fieldSetFlags()[1] = false; return this; diff --git a/src/main/java/edu/berkeley/path/ModelElements/FD.java b/src/main/java/edu/berkeley/path/model_elements/FD.java similarity index 83% rename from src/main/java/edu/berkeley/path/ModelElements/FD.java rename to src/main/java/edu/berkeley/path/model_elements/FD.java index 3ed6efa..b1e0f1d 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/FD.java +++ b/src/main/java/edu/berkeley/path/model_elements/FD.java @@ -3,11 +3,11 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") /** Fundamental diagram on one link at one time */ public class FD extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"FD\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"doc\":\"Fundamental diagram on one link at one time\",\"fields\":[{\"name\":\"freeFlowSpeed\",\"type\":\"double\"},{\"name\":\"freeFlowSpeedStdev\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeed\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeedStdev\",\"type\":\"double\"},{\"name\":\"capacity\",\"type\":\"double\"},{\"name\":\"capacityStdev\",\"type\":\"double\"},{\"name\":\"jamDensity\",\"type\":\"double\"},{\"name\":\"capacityDrop\",\"type\":\"double\"}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"FD\",\"namespace\":\"edu.berkeley.path.model_elements\",\"doc\":\"Fundamental diagram on one link at one time\",\"fields\":[{\"name\":\"freeFlowSpeed\",\"type\":\"double\"},{\"name\":\"freeFlowSpeedStdev\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeed\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeedStdev\",\"type\":\"double\"},{\"name\":\"capacity\",\"type\":\"double\"},{\"name\":\"capacityStdev\",\"type\":\"double\"},{\"name\":\"jamDensity\",\"type\":\"double\"},{\"name\":\"capacityDrop\",\"type\":\"double\"}]}"); @Deprecated public double freeFlowSpeed; @Deprecated public double freeFlowSpeedStdev; @Deprecated public double congestionWaveSpeed; @@ -168,18 +168,18 @@ public void setCapacityDrop(java.lang.Double value) { } /** Creates a new FD RecordBuilder */ - public static edu.berkeley.path.ModelElements.FD.Builder newBuilder() { - return new edu.berkeley.path.ModelElements.FD.Builder(); + public static edu.berkeley.path.model_elements.FD.Builder newBuilder() { + return new edu.berkeley.path.model_elements.FD.Builder(); } /** Creates a new FD RecordBuilder by copying an existing Builder */ - public static edu.berkeley.path.ModelElements.FD.Builder newBuilder(edu.berkeley.path.ModelElements.FD.Builder other) { - return new edu.berkeley.path.ModelElements.FD.Builder(other); + public static edu.berkeley.path.model_elements.FD.Builder newBuilder(edu.berkeley.path.model_elements.FD.Builder other) { + return new edu.berkeley.path.model_elements.FD.Builder(other); } /** Creates a new FD RecordBuilder by copying an existing FD instance */ - public static edu.berkeley.path.ModelElements.FD.Builder newBuilder(edu.berkeley.path.ModelElements.FD other) { - return new edu.berkeley.path.ModelElements.FD.Builder(other); + public static edu.berkeley.path.model_elements.FD.Builder newBuilder(edu.berkeley.path.model_elements.FD other) { + return new edu.berkeley.path.model_elements.FD.Builder(other); } /** @@ -199,17 +199,17 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.FD.SCHEMA$); + super(edu.berkeley.path.model_elements.FD.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.FD.Builder other) { + private Builder(edu.berkeley.path.model_elements.FD.Builder other) { super(other); } /** Creates a Builder by copying an existing FD instance */ - private Builder(edu.berkeley.path.ModelElements.FD other) { - super(edu.berkeley.path.ModelElements.FD.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.FD other) { + super(edu.berkeley.path.model_elements.FD.SCHEMA$); if (isValidValue(fields()[0], other.freeFlowSpeed)) { this.freeFlowSpeed = (java.lang.Double) data().deepCopy(fields()[0].schema(), other.freeFlowSpeed); fieldSetFlags()[0] = true; @@ -250,7 +250,7 @@ public java.lang.Double getFreeFlowSpeed() { } /** Sets the value of the 'freeFlowSpeed' field */ - public edu.berkeley.path.ModelElements.FD.Builder setFreeFlowSpeed(double value) { + public edu.berkeley.path.model_elements.FD.Builder setFreeFlowSpeed(double value) { validate(fields()[0], value); this.freeFlowSpeed = value; fieldSetFlags()[0] = true; @@ -263,7 +263,7 @@ public boolean hasFreeFlowSpeed() { } /** Clears the value of the 'freeFlowSpeed' field */ - public edu.berkeley.path.ModelElements.FD.Builder clearFreeFlowSpeed() { + public edu.berkeley.path.model_elements.FD.Builder clearFreeFlowSpeed() { fieldSetFlags()[0] = false; return this; } @@ -274,7 +274,7 @@ public java.lang.Double getFreeFlowSpeedStdev() { } /** Sets the value of the 'freeFlowSpeedStdev' field */ - public edu.berkeley.path.ModelElements.FD.Builder setFreeFlowSpeedStdev(double value) { + public edu.berkeley.path.model_elements.FD.Builder setFreeFlowSpeedStdev(double value) { validate(fields()[1], value); this.freeFlowSpeedStdev = value; fieldSetFlags()[1] = true; @@ -287,7 +287,7 @@ public boolean hasFreeFlowSpeedStdev() { } /** Clears the value of the 'freeFlowSpeedStdev' field */ - public edu.berkeley.path.ModelElements.FD.Builder clearFreeFlowSpeedStdev() { + public edu.berkeley.path.model_elements.FD.Builder clearFreeFlowSpeedStdev() { fieldSetFlags()[1] = false; return this; } @@ -298,7 +298,7 @@ public java.lang.Double getCongestionWaveSpeed() { } /** Sets the value of the 'congestionWaveSpeed' field */ - public edu.berkeley.path.ModelElements.FD.Builder setCongestionWaveSpeed(double value) { + public edu.berkeley.path.model_elements.FD.Builder setCongestionWaveSpeed(double value) { validate(fields()[2], value); this.congestionWaveSpeed = value; fieldSetFlags()[2] = true; @@ -311,7 +311,7 @@ public boolean hasCongestionWaveSpeed() { } /** Clears the value of the 'congestionWaveSpeed' field */ - public edu.berkeley.path.ModelElements.FD.Builder clearCongestionWaveSpeed() { + public edu.berkeley.path.model_elements.FD.Builder clearCongestionWaveSpeed() { fieldSetFlags()[2] = false; return this; } @@ -322,7 +322,7 @@ public java.lang.Double getCongestionWaveSpeedStdev() { } /** Sets the value of the 'congestionWaveSpeedStdev' field */ - public edu.berkeley.path.ModelElements.FD.Builder setCongestionWaveSpeedStdev(double value) { + public edu.berkeley.path.model_elements.FD.Builder setCongestionWaveSpeedStdev(double value) { validate(fields()[3], value); this.congestionWaveSpeedStdev = value; fieldSetFlags()[3] = true; @@ -335,7 +335,7 @@ public boolean hasCongestionWaveSpeedStdev() { } /** Clears the value of the 'congestionWaveSpeedStdev' field */ - public edu.berkeley.path.ModelElements.FD.Builder clearCongestionWaveSpeedStdev() { + public edu.berkeley.path.model_elements.FD.Builder clearCongestionWaveSpeedStdev() { fieldSetFlags()[3] = false; return this; } @@ -346,7 +346,7 @@ public java.lang.Double getCapacity() { } /** Sets the value of the 'capacity' field */ - public edu.berkeley.path.ModelElements.FD.Builder setCapacity(double value) { + public edu.berkeley.path.model_elements.FD.Builder setCapacity(double value) { validate(fields()[4], value); this.capacity = value; fieldSetFlags()[4] = true; @@ -359,7 +359,7 @@ public boolean hasCapacity() { } /** Clears the value of the 'capacity' field */ - public edu.berkeley.path.ModelElements.FD.Builder clearCapacity() { + public edu.berkeley.path.model_elements.FD.Builder clearCapacity() { fieldSetFlags()[4] = false; return this; } @@ -370,7 +370,7 @@ public java.lang.Double getCapacityStdev() { } /** Sets the value of the 'capacityStdev' field */ - public edu.berkeley.path.ModelElements.FD.Builder setCapacityStdev(double value) { + public edu.berkeley.path.model_elements.FD.Builder setCapacityStdev(double value) { validate(fields()[5], value); this.capacityStdev = value; fieldSetFlags()[5] = true; @@ -383,7 +383,7 @@ public boolean hasCapacityStdev() { } /** Clears the value of the 'capacityStdev' field */ - public edu.berkeley.path.ModelElements.FD.Builder clearCapacityStdev() { + public edu.berkeley.path.model_elements.FD.Builder clearCapacityStdev() { fieldSetFlags()[5] = false; return this; } @@ -394,7 +394,7 @@ public java.lang.Double getJamDensity() { } /** Sets the value of the 'jamDensity' field */ - public edu.berkeley.path.ModelElements.FD.Builder setJamDensity(double value) { + public edu.berkeley.path.model_elements.FD.Builder setJamDensity(double value) { validate(fields()[6], value); this.jamDensity = value; fieldSetFlags()[6] = true; @@ -407,7 +407,7 @@ public boolean hasJamDensity() { } /** Clears the value of the 'jamDensity' field */ - public edu.berkeley.path.ModelElements.FD.Builder clearJamDensity() { + public edu.berkeley.path.model_elements.FD.Builder clearJamDensity() { fieldSetFlags()[6] = false; return this; } @@ -418,7 +418,7 @@ public java.lang.Double getCapacityDrop() { } /** Sets the value of the 'capacityDrop' field */ - public edu.berkeley.path.ModelElements.FD.Builder setCapacityDrop(double value) { + public edu.berkeley.path.model_elements.FD.Builder setCapacityDrop(double value) { validate(fields()[7], value); this.capacityDrop = value; fieldSetFlags()[7] = true; @@ -431,7 +431,7 @@ public boolean hasCapacityDrop() { } /** Clears the value of the 'capacityDrop' field */ - public edu.berkeley.path.ModelElements.FD.Builder clearCapacityDrop() { + public edu.berkeley.path.model_elements.FD.Builder clearCapacityDrop() { fieldSetFlags()[7] = false; return this; } diff --git a/src/main/java/edu/berkeley/path/ModelElements/FDProfile.java b/src/main/java/edu/berkeley/path/model_elements/FDProfile.java similarity index 66% rename from src/main/java/edu/berkeley/path/ModelElements/FDProfile.java rename to src/main/java/edu/berkeley/path/model_elements/FDProfile.java index 19a72f8..42fa70c 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/FDProfile.java +++ b/src/main/java/edu/berkeley/path/model_elements/FDProfile.java @@ -3,15 +3,15 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") /** Fundamental diagrams on each link as time series */ public class FDProfile extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"FDProfile\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"doc\":\"Fundamental diagrams on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"fd\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"FD\",\"doc\":\"Fundamental diagram on one link at one time\",\"fields\":[{\"name\":\"freeFlowSpeed\",\"type\":\"double\"},{\"name\":\"freeFlowSpeedStdev\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeed\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeedStdev\",\"type\":\"double\"},{\"name\":\"capacity\",\"type\":\"double\"},{\"name\":\"capacityStdev\",\"type\":\"double\"},{\"name\":\"jamDensity\",\"type\":\"double\"},{\"name\":\"capacityDrop\",\"type\":\"double\"}]}}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"FDProfile\",\"namespace\":\"edu.berkeley.path.model_elements\",\"doc\":\"Fundamental diagrams on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"fd\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"FD\",\"doc\":\"Fundamental diagram on one link at one time\",\"fields\":[{\"name\":\"freeFlowSpeed\",\"type\":\"double\"},{\"name\":\"freeFlowSpeedStdev\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeed\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeedStdev\",\"type\":\"double\"},{\"name\":\"capacity\",\"type\":\"double\"},{\"name\":\"capacityStdev\",\"type\":\"double\"},{\"name\":\"jamDensity\",\"type\":\"double\"},{\"name\":\"capacityDrop\",\"type\":\"double\"}]}}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]}"); @Deprecated public double dt; @Deprecated public double startTime; /** map key is linkId, array is time series, as per dt and startTime. */ - @Deprecated public java.util.Map> fd; + @Deprecated public java.util.Map> fd; public org.apache.avro.Schema getSchema() { return SCHEMA$; } // Used by DatumWriter. Applications should not call. public java.lang.Object get(int field$) { @@ -28,7 +28,7 @@ public void put(int field$, java.lang.Object value$) { switch (field$) { case 0: dt = (java.lang.Double)value$; break; case 1: startTime = (java.lang.Double)value$; break; - case 2: fd = (java.util.Map>)value$; break; + case 2: fd = (java.util.Map>)value$; break; default: throw new org.apache.avro.AvroRuntimeException("Bad index"); } } @@ -66,7 +66,7 @@ public void setStartTime(java.lang.Double value) { /** * Gets the value of the 'fd' field. * map key is linkId, array is time series, as per dt and startTime. */ - public java.util.Map> getFd() { + public java.util.Map> getFd() { return fd; } @@ -74,23 +74,23 @@ public java.util.Map> value) { + public void setFd(java.util.Map> value) { this.fd = value; } /** Creates a new FDProfile RecordBuilder */ - public static edu.berkeley.path.ModelElements.FDProfile.Builder newBuilder() { - return new edu.berkeley.path.ModelElements.FDProfile.Builder(); + public static edu.berkeley.path.model_elements.FDProfile.Builder newBuilder() { + return new edu.berkeley.path.model_elements.FDProfile.Builder(); } /** Creates a new FDProfile RecordBuilder by copying an existing Builder */ - public static edu.berkeley.path.ModelElements.FDProfile.Builder newBuilder(edu.berkeley.path.ModelElements.FDProfile.Builder other) { - return new edu.berkeley.path.ModelElements.FDProfile.Builder(other); + public static edu.berkeley.path.model_elements.FDProfile.Builder newBuilder(edu.berkeley.path.model_elements.FDProfile.Builder other) { + return new edu.berkeley.path.model_elements.FDProfile.Builder(other); } /** Creates a new FDProfile RecordBuilder by copying an existing FDProfile instance */ - public static edu.berkeley.path.ModelElements.FDProfile.Builder newBuilder(edu.berkeley.path.ModelElements.FDProfile other) { - return new edu.berkeley.path.ModelElements.FDProfile.Builder(other); + public static edu.berkeley.path.model_elements.FDProfile.Builder newBuilder(edu.berkeley.path.model_elements.FDProfile other) { + return new edu.berkeley.path.model_elements.FDProfile.Builder(other); } /** @@ -101,21 +101,21 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild private double dt; private double startTime; - private java.util.Map> fd; + private java.util.Map> fd; /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.FDProfile.SCHEMA$); + super(edu.berkeley.path.model_elements.FDProfile.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.FDProfile.Builder other) { + private Builder(edu.berkeley.path.model_elements.FDProfile.Builder other) { super(other); } /** Creates a Builder by copying an existing FDProfile instance */ - private Builder(edu.berkeley.path.ModelElements.FDProfile other) { - super(edu.berkeley.path.ModelElements.FDProfile.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.FDProfile other) { + super(edu.berkeley.path.model_elements.FDProfile.SCHEMA$); if (isValidValue(fields()[0], other.dt)) { this.dt = (java.lang.Double) data().deepCopy(fields()[0].schema(), other.dt); fieldSetFlags()[0] = true; @@ -125,7 +125,7 @@ private Builder(edu.berkeley.path.ModelElements.FDProfile other) { fieldSetFlags()[1] = true; } if (isValidValue(fields()[2], other.fd)) { - this.fd = (java.util.Map>) data().deepCopy(fields()[2].schema(), other.fd); + this.fd = (java.util.Map>) data().deepCopy(fields()[2].schema(), other.fd); fieldSetFlags()[2] = true; } } @@ -136,7 +136,7 @@ public java.lang.Double getDt() { } /** Sets the value of the 'dt' field */ - public edu.berkeley.path.ModelElements.FDProfile.Builder setDt(double value) { + public edu.berkeley.path.model_elements.FDProfile.Builder setDt(double value) { validate(fields()[0], value); this.dt = value; fieldSetFlags()[0] = true; @@ -149,7 +149,7 @@ public boolean hasDt() { } /** Clears the value of the 'dt' field */ - public edu.berkeley.path.ModelElements.FDProfile.Builder clearDt() { + public edu.berkeley.path.model_elements.FDProfile.Builder clearDt() { fieldSetFlags()[0] = false; return this; } @@ -160,7 +160,7 @@ public java.lang.Double getStartTime() { } /** Sets the value of the 'startTime' field */ - public edu.berkeley.path.ModelElements.FDProfile.Builder setStartTime(double value) { + public edu.berkeley.path.model_elements.FDProfile.Builder setStartTime(double value) { validate(fields()[1], value); this.startTime = value; fieldSetFlags()[1] = true; @@ -173,18 +173,18 @@ public boolean hasStartTime() { } /** Clears the value of the 'startTime' field */ - public edu.berkeley.path.ModelElements.FDProfile.Builder clearStartTime() { + public edu.berkeley.path.model_elements.FDProfile.Builder clearStartTime() { fieldSetFlags()[1] = false; return this; } /** Gets the value of the 'fd' field */ - public java.util.Map> getFd() { + public java.util.Map> getFd() { return fd; } /** Sets the value of the 'fd' field */ - public edu.berkeley.path.ModelElements.FDProfile.Builder setFd(java.util.Map> value) { + public edu.berkeley.path.model_elements.FDProfile.Builder setFd(java.util.Map> value) { validate(fields()[2], value); this.fd = value; fieldSetFlags()[2] = true; @@ -197,7 +197,7 @@ public boolean hasFd() { } /** Clears the value of the 'fd' field */ - public edu.berkeley.path.ModelElements.FDProfile.Builder clearFd() { + public edu.berkeley.path.model_elements.FDProfile.Builder clearFd() { fd = null; fieldSetFlags()[2] = false; return this; @@ -209,7 +209,7 @@ public FDProfile build() { FDProfile record = new FDProfile(); record.dt = fieldSetFlags()[0] ? this.dt : (java.lang.Double) defaultValue(fields()[0]); record.startTime = fieldSetFlags()[1] ? this.startTime : (java.lang.Double) defaultValue(fields()[1]); - record.fd = fieldSetFlags()[2] ? this.fd : (java.util.Map>) defaultValue(fields()[2]); + record.fd = fieldSetFlags()[2] ? this.fd : (java.util.Map>) defaultValue(fields()[2]); return record; } catch (Exception e) { throw new org.apache.avro.AvroRuntimeException(e); diff --git a/src/main/java/edu/berkeley/path/ModelElements/Link.java b/src/main/java/edu/berkeley/path/model_elements/Link.java similarity index 74% rename from src/main/java/edu/berkeley/path/ModelElements/Link.java rename to src/main/java/edu/berkeley/path/model_elements/Link.java index 13eca03..3d7dfd8 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/Link.java +++ b/src/main/java/edu/berkeley/path/model_elements/Link.java @@ -3,18 +3,18 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") public class Link extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Link\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"},{\"name\":\"laneCount\",\"type\":\"double\"},{\"name\":\"length\",\"type\":\"double\"},{\"name\":\"laneOffset\",\"type\":\"int\",\"default\":0},{\"name\":\"begin\",\"type\":{\"type\":\"record\",\"name\":\"NodeRef\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]}},{\"name\":\"end\",\"type\":\"NodeRef\"}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Link\",\"namespace\":\"edu.berkeley.path.model_elements\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"},{\"name\":\"laneCount\",\"type\":\"double\"},{\"name\":\"length\",\"type\":\"double\"},{\"name\":\"laneOffset\",\"type\":\"int\",\"default\":0},{\"name\":\"begin\",\"type\":{\"type\":\"record\",\"name\":\"NodeRef\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]}},{\"name\":\"end\",\"type\":\"NodeRef\"}]}"); @Deprecated public java.lang.CharSequence id; @Deprecated public java.lang.CharSequence name; @Deprecated public java.lang.CharSequence type; @Deprecated public double laneCount; @Deprecated public double length; @Deprecated public int laneOffset; - @Deprecated public edu.berkeley.path.ModelElements.NodeRef begin; - @Deprecated public edu.berkeley.path.ModelElements.NodeRef end; + @Deprecated public edu.berkeley.path.model_elements.NodeRef begin; + @Deprecated public edu.berkeley.path.model_elements.NodeRef end; public org.apache.avro.Schema getSchema() { return SCHEMA$; } // Used by DatumWriter. Applications should not call. public java.lang.Object get(int field$) { @@ -40,8 +40,8 @@ public void put(int field$, java.lang.Object value$) { case 3: laneCount = (java.lang.Double)value$; break; case 4: length = (java.lang.Double)value$; break; case 5: laneOffset = (java.lang.Integer)value$; break; - case 6: begin = (edu.berkeley.path.ModelElements.NodeRef)value$; break; - case 7: end = (edu.berkeley.path.ModelElements.NodeRef)value$; break; + case 6: begin = (edu.berkeley.path.model_elements.NodeRef)value$; break; + case 7: end = (edu.berkeley.path.model_elements.NodeRef)value$; break; default: throw new org.apache.avro.AvroRuntimeException("Bad index"); } } @@ -139,7 +139,7 @@ public void setLaneOffset(java.lang.Integer value) { /** * Gets the value of the 'begin' field. */ - public edu.berkeley.path.ModelElements.NodeRef getBegin() { + public edu.berkeley.path.model_elements.NodeRef getBegin() { return begin; } @@ -147,14 +147,14 @@ public edu.berkeley.path.ModelElements.NodeRef getBegin() { * Sets the value of the 'begin' field. * @param value the value to set. */ - public void setBegin(edu.berkeley.path.ModelElements.NodeRef value) { + public void setBegin(edu.berkeley.path.model_elements.NodeRef value) { this.begin = value; } /** * Gets the value of the 'end' field. */ - public edu.berkeley.path.ModelElements.NodeRef getEnd() { + public edu.berkeley.path.model_elements.NodeRef getEnd() { return end; } @@ -162,23 +162,23 @@ public edu.berkeley.path.ModelElements.NodeRef getEnd() { * Sets the value of the 'end' field. * @param value the value to set. */ - public void setEnd(edu.berkeley.path.ModelElements.NodeRef value) { + public void setEnd(edu.berkeley.path.model_elements.NodeRef value) { this.end = value; } /** Creates a new Link RecordBuilder */ - public static edu.berkeley.path.ModelElements.Link.Builder newBuilder() { - return new edu.berkeley.path.ModelElements.Link.Builder(); + public static edu.berkeley.path.model_elements.Link.Builder newBuilder() { + return new edu.berkeley.path.model_elements.Link.Builder(); } /** Creates a new Link RecordBuilder by copying an existing Builder */ - public static edu.berkeley.path.ModelElements.Link.Builder newBuilder(edu.berkeley.path.ModelElements.Link.Builder other) { - return new edu.berkeley.path.ModelElements.Link.Builder(other); + public static edu.berkeley.path.model_elements.Link.Builder newBuilder(edu.berkeley.path.model_elements.Link.Builder other) { + return new edu.berkeley.path.model_elements.Link.Builder(other); } /** Creates a new Link RecordBuilder by copying an existing Link instance */ - public static edu.berkeley.path.ModelElements.Link.Builder newBuilder(edu.berkeley.path.ModelElements.Link other) { - return new edu.berkeley.path.ModelElements.Link.Builder(other); + public static edu.berkeley.path.model_elements.Link.Builder newBuilder(edu.berkeley.path.model_elements.Link other) { + return new edu.berkeley.path.model_elements.Link.Builder(other); } /** @@ -193,22 +193,22 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild private double laneCount; private double length; private int laneOffset; - private edu.berkeley.path.ModelElements.NodeRef begin; - private edu.berkeley.path.ModelElements.NodeRef end; + private edu.berkeley.path.model_elements.NodeRef begin; + private edu.berkeley.path.model_elements.NodeRef end; /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.Link.SCHEMA$); + super(edu.berkeley.path.model_elements.Link.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.Link.Builder other) { + private Builder(edu.berkeley.path.model_elements.Link.Builder other) { super(other); } /** Creates a Builder by copying an existing Link instance */ - private Builder(edu.berkeley.path.ModelElements.Link other) { - super(edu.berkeley.path.ModelElements.Link.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.Link other) { + super(edu.berkeley.path.model_elements.Link.SCHEMA$); if (isValidValue(fields()[0], other.id)) { this.id = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.id); fieldSetFlags()[0] = true; @@ -234,11 +234,11 @@ private Builder(edu.berkeley.path.ModelElements.Link other) { fieldSetFlags()[5] = true; } if (isValidValue(fields()[6], other.begin)) { - this.begin = (edu.berkeley.path.ModelElements.NodeRef) data().deepCopy(fields()[6].schema(), other.begin); + this.begin = (edu.berkeley.path.model_elements.NodeRef) data().deepCopy(fields()[6].schema(), other.begin); fieldSetFlags()[6] = true; } if (isValidValue(fields()[7], other.end)) { - this.end = (edu.berkeley.path.ModelElements.NodeRef) data().deepCopy(fields()[7].schema(), other.end); + this.end = (edu.berkeley.path.model_elements.NodeRef) data().deepCopy(fields()[7].schema(), other.end); fieldSetFlags()[7] = true; } } @@ -249,7 +249,7 @@ public java.lang.CharSequence getId() { } /** Sets the value of the 'id' field */ - public edu.berkeley.path.ModelElements.Link.Builder setId(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.Link.Builder setId(java.lang.CharSequence value) { validate(fields()[0], value); this.id = value; fieldSetFlags()[0] = true; @@ -262,7 +262,7 @@ public boolean hasId() { } /** Clears the value of the 'id' field */ - public edu.berkeley.path.ModelElements.Link.Builder clearId() { + public edu.berkeley.path.model_elements.Link.Builder clearId() { id = null; fieldSetFlags()[0] = false; return this; @@ -274,7 +274,7 @@ public java.lang.CharSequence getName() { } /** Sets the value of the 'name' field */ - public edu.berkeley.path.ModelElements.Link.Builder setName(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.Link.Builder setName(java.lang.CharSequence value) { validate(fields()[1], value); this.name = value; fieldSetFlags()[1] = true; @@ -287,7 +287,7 @@ public boolean hasName() { } /** Clears the value of the 'name' field */ - public edu.berkeley.path.ModelElements.Link.Builder clearName() { + public edu.berkeley.path.model_elements.Link.Builder clearName() { name = null; fieldSetFlags()[1] = false; return this; @@ -299,7 +299,7 @@ public java.lang.CharSequence getType() { } /** Sets the value of the 'type' field */ - public edu.berkeley.path.ModelElements.Link.Builder setType(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.Link.Builder setType(java.lang.CharSequence value) { validate(fields()[2], value); this.type = value; fieldSetFlags()[2] = true; @@ -312,7 +312,7 @@ public boolean hasType() { } /** Clears the value of the 'type' field */ - public edu.berkeley.path.ModelElements.Link.Builder clearType() { + public edu.berkeley.path.model_elements.Link.Builder clearType() { type = null; fieldSetFlags()[2] = false; return this; @@ -324,7 +324,7 @@ public java.lang.Double getLaneCount() { } /** Sets the value of the 'laneCount' field */ - public edu.berkeley.path.ModelElements.Link.Builder setLaneCount(double value) { + public edu.berkeley.path.model_elements.Link.Builder setLaneCount(double value) { validate(fields()[3], value); this.laneCount = value; fieldSetFlags()[3] = true; @@ -337,7 +337,7 @@ public boolean hasLaneCount() { } /** Clears the value of the 'laneCount' field */ - public edu.berkeley.path.ModelElements.Link.Builder clearLaneCount() { + public edu.berkeley.path.model_elements.Link.Builder clearLaneCount() { fieldSetFlags()[3] = false; return this; } @@ -348,7 +348,7 @@ public java.lang.Double getLength() { } /** Sets the value of the 'length' field */ - public edu.berkeley.path.ModelElements.Link.Builder setLength(double value) { + public edu.berkeley.path.model_elements.Link.Builder setLength(double value) { validate(fields()[4], value); this.length = value; fieldSetFlags()[4] = true; @@ -361,7 +361,7 @@ public boolean hasLength() { } /** Clears the value of the 'length' field */ - public edu.berkeley.path.ModelElements.Link.Builder clearLength() { + public edu.berkeley.path.model_elements.Link.Builder clearLength() { fieldSetFlags()[4] = false; return this; } @@ -372,7 +372,7 @@ public java.lang.Integer getLaneOffset() { } /** Sets the value of the 'laneOffset' field */ - public edu.berkeley.path.ModelElements.Link.Builder setLaneOffset(int value) { + public edu.berkeley.path.model_elements.Link.Builder setLaneOffset(int value) { validate(fields()[5], value); this.laneOffset = value; fieldSetFlags()[5] = true; @@ -385,18 +385,18 @@ public boolean hasLaneOffset() { } /** Clears the value of the 'laneOffset' field */ - public edu.berkeley.path.ModelElements.Link.Builder clearLaneOffset() { + public edu.berkeley.path.model_elements.Link.Builder clearLaneOffset() { fieldSetFlags()[5] = false; return this; } /** Gets the value of the 'begin' field */ - public edu.berkeley.path.ModelElements.NodeRef getBegin() { + public edu.berkeley.path.model_elements.NodeRef getBegin() { return begin; } /** Sets the value of the 'begin' field */ - public edu.berkeley.path.ModelElements.Link.Builder setBegin(edu.berkeley.path.ModelElements.NodeRef value) { + public edu.berkeley.path.model_elements.Link.Builder setBegin(edu.berkeley.path.model_elements.NodeRef value) { validate(fields()[6], value); this.begin = value; fieldSetFlags()[6] = true; @@ -409,19 +409,19 @@ public boolean hasBegin() { } /** Clears the value of the 'begin' field */ - public edu.berkeley.path.ModelElements.Link.Builder clearBegin() { + public edu.berkeley.path.model_elements.Link.Builder clearBegin() { begin = null; fieldSetFlags()[6] = false; return this; } /** Gets the value of the 'end' field */ - public edu.berkeley.path.ModelElements.NodeRef getEnd() { + public edu.berkeley.path.model_elements.NodeRef getEnd() { return end; } /** Sets the value of the 'end' field */ - public edu.berkeley.path.ModelElements.Link.Builder setEnd(edu.berkeley.path.ModelElements.NodeRef value) { + public edu.berkeley.path.model_elements.Link.Builder setEnd(edu.berkeley.path.model_elements.NodeRef value) { validate(fields()[7], value); this.end = value; fieldSetFlags()[7] = true; @@ -434,7 +434,7 @@ public boolean hasEnd() { } /** Clears the value of the 'end' field */ - public edu.berkeley.path.ModelElements.Link.Builder clearEnd() { + public edu.berkeley.path.model_elements.Link.Builder clearEnd() { end = null; fieldSetFlags()[7] = false; return this; @@ -450,8 +450,8 @@ public Link build() { record.laneCount = fieldSetFlags()[3] ? this.laneCount : (java.lang.Double) defaultValue(fields()[3]); record.length = fieldSetFlags()[4] ? this.length : (java.lang.Double) defaultValue(fields()[4]); record.laneOffset = fieldSetFlags()[5] ? this.laneOffset : (java.lang.Integer) defaultValue(fields()[5]); - record.begin = fieldSetFlags()[6] ? this.begin : (edu.berkeley.path.ModelElements.NodeRef) defaultValue(fields()[6]); - record.end = fieldSetFlags()[7] ? this.end : (edu.berkeley.path.ModelElements.NodeRef) defaultValue(fields()[7]); + record.begin = fieldSetFlags()[6] ? this.begin : (edu.berkeley.path.model_elements.NodeRef) defaultValue(fields()[6]); + record.end = fieldSetFlags()[7] ? this.end : (edu.berkeley.path.model_elements.NodeRef) defaultValue(fields()[7]); return record; } catch (Exception e) { throw new org.apache.avro.AvroRuntimeException(e); diff --git a/src/main/java/edu/berkeley/path/ModelElements/LinkRef.java b/src/main/java/edu/berkeley/path/model_elements/LinkRef.java similarity index 72% rename from src/main/java/edu/berkeley/path/ModelElements/LinkRef.java rename to src/main/java/edu/berkeley/path/model_elements/LinkRef.java index 6058532..bd49661 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/LinkRef.java +++ b/src/main/java/edu/berkeley/path/model_elements/LinkRef.java @@ -3,10 +3,10 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") public class LinkRef extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"LinkRef\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"fields\":[{\"name\":\"linkId\",\"type\":\"string\"}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"LinkRef\",\"namespace\":\"edu.berkeley.path.model_elements\",\"fields\":[{\"name\":\"linkId\",\"type\":\"string\"}]}"); @Deprecated public java.lang.CharSequence linkId; public org.apache.avro.Schema getSchema() { return SCHEMA$; } // Used by DatumWriter. Applications should not call. @@ -41,18 +41,18 @@ public void setLinkId(java.lang.CharSequence value) { } /** Creates a new LinkRef RecordBuilder */ - public static edu.berkeley.path.ModelElements.LinkRef.Builder newBuilder() { - return new edu.berkeley.path.ModelElements.LinkRef.Builder(); + public static edu.berkeley.path.model_elements.LinkRef.Builder newBuilder() { + return new edu.berkeley.path.model_elements.LinkRef.Builder(); } /** Creates a new LinkRef RecordBuilder by copying an existing Builder */ - public static edu.berkeley.path.ModelElements.LinkRef.Builder newBuilder(edu.berkeley.path.ModelElements.LinkRef.Builder other) { - return new edu.berkeley.path.ModelElements.LinkRef.Builder(other); + public static edu.berkeley.path.model_elements.LinkRef.Builder newBuilder(edu.berkeley.path.model_elements.LinkRef.Builder other) { + return new edu.berkeley.path.model_elements.LinkRef.Builder(other); } /** Creates a new LinkRef RecordBuilder by copying an existing LinkRef instance */ - public static edu.berkeley.path.ModelElements.LinkRef.Builder newBuilder(edu.berkeley.path.ModelElements.LinkRef other) { - return new edu.berkeley.path.ModelElements.LinkRef.Builder(other); + public static edu.berkeley.path.model_elements.LinkRef.Builder newBuilder(edu.berkeley.path.model_elements.LinkRef other) { + return new edu.berkeley.path.model_elements.LinkRef.Builder(other); } /** @@ -65,17 +65,17 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.LinkRef.SCHEMA$); + super(edu.berkeley.path.model_elements.LinkRef.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.LinkRef.Builder other) { + private Builder(edu.berkeley.path.model_elements.LinkRef.Builder other) { super(other); } /** Creates a Builder by copying an existing LinkRef instance */ - private Builder(edu.berkeley.path.ModelElements.LinkRef other) { - super(edu.berkeley.path.ModelElements.LinkRef.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.LinkRef other) { + super(edu.berkeley.path.model_elements.LinkRef.SCHEMA$); if (isValidValue(fields()[0], other.linkId)) { this.linkId = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.linkId); fieldSetFlags()[0] = true; @@ -88,7 +88,7 @@ public java.lang.CharSequence getLinkId() { } /** Sets the value of the 'linkId' field */ - public edu.berkeley.path.ModelElements.LinkRef.Builder setLinkId(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.LinkRef.Builder setLinkId(java.lang.CharSequence value) { validate(fields()[0], value); this.linkId = value; fieldSetFlags()[0] = true; @@ -101,7 +101,7 @@ public boolean hasLinkId() { } /** Clears the value of the 'linkId' field */ - public edu.berkeley.path.ModelElements.LinkRef.Builder clearLinkId() { + public edu.berkeley.path.model_elements.LinkRef.Builder clearLinkId() { linkId = null; fieldSetFlags()[0] = false; return this; diff --git a/src/main/java/edu/berkeley/path/model_elements/ModelElements.java b/src/main/java/edu/berkeley/path/model_elements/ModelElements.java new file mode 100644 index 0000000..28c5291 --- /dev/null +++ b/src/main/java/edu/berkeley/path/model_elements/ModelElements.java @@ -0,0 +1,22 @@ +/** + * Autogenerated by Avro + * + * DO NOT EDIT DIRECTLY + */ +package edu.berkeley.path.model_elements; + +@SuppressWarnings("all") +/** * Description of the config and state of our networks and related data. + * + * Note: all units in SI (meters, seconds, etc.) except where specified. */ +public interface ModelElements { + public static final org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse("{\"protocol\":\"ModelElements\",\"namespace\":\"edu.berkeley.path.model_elements\",\"doc\":\"* Description of the config and state of our networks and related data.\\n *\\n * Note: all units in SI (meters, seconds, etc.) except where specified.\",\"types\":[{\"type\":\"record\",\"name\":\"Time\",\"doc\":\"seconds and milliseconds, can be absolute or relative\\n (when absolute: since epoch, utc)\",\"fields\":[{\"name\":\"seconds\",\"type\":\"long\"},{\"name\":\"milliseconds\",\"type\":\"long\"}]},{\"type\":\"record\",\"name\":\"NodeRef\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"LinkRef\",\"fields\":[{\"name\":\"linkId\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"NetworkRef\",\"fields\":[{\"name\":\"networkId\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Node\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Link\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"},{\"name\":\"laneCount\",\"type\":\"double\"},{\"name\":\"length\",\"type\":\"double\"},{\"name\":\"laneOffset\",\"type\":\"int\",\"default\":0},{\"name\":\"begin\",\"type\":\"NodeRef\"},{\"name\":\"end\",\"type\":\"NodeRef\"}]},{\"type\":\"record\",\"name\":\"Network\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"default\":\"1\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"nodes\",\"type\":{\"type\":\"array\",\"items\":\"Node\"},\"default\":[]},{\"name\":\"links\",\"type\":{\"type\":\"array\",\"items\":\"Link\"},\"default\":[]}]},{\"type\":\"record\",\"name\":\"DensityProfile\",\"doc\":\"Density on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"vehiclesPerMeter\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"SpeedProfile\",\"doc\":\"Speed on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"metersPerSecond\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"FD\",\"doc\":\"Fundamental diagram on one link at one time\",\"fields\":[{\"name\":\"freeFlowSpeed\",\"type\":\"double\"},{\"name\":\"freeFlowSpeedStdev\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeed\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeedStdev\",\"type\":\"double\"},{\"name\":\"capacity\",\"type\":\"double\"},{\"name\":\"capacityStdev\",\"type\":\"double\"},{\"name\":\"jamDensity\",\"type\":\"double\"},{\"name\":\"capacityDrop\",\"type\":\"double\"}]},{\"type\":\"record\",\"name\":\"FDProfile\",\"doc\":\"Fundamental diagrams on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"fd\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"FD\"}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"DemandProfile\",\"doc\":\"Demands on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"origin\",\"type\":\"LinkRef\",\"doc\":\"may not be null\"},{\"name\":\"destination\",\"type\":\"LinkRef\",\"doc\":\"may be null\"},{\"name\":\"demand\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"Scenario\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"network\",\"type\":\"Network\"},{\"name\":\"initialDensityProfile\",\"type\":\"DensityProfile\"},{\"name\":\"fdProfile\",\"type\":\"FDProfile\"},{\"name\":\"demandProfile\",\"type\":\"DemandProfile\"}]}],\"messages\":{}}"); + + @SuppressWarnings("all") + /** * Description of the config and state of our networks and related data. + * + * Note: all units in SI (meters, seconds, etc.) except where specified. */ + public interface Callback extends ModelElements { + public static final org.apache.avro.Protocol PROTOCOL = edu.berkeley.path.model_elements.ModelElements.PROTOCOL; + } +} \ No newline at end of file diff --git a/src/main/java/edu/berkeley/path/ModelElements/Network.java b/src/main/java/edu/berkeley/path/model_elements/Network.java similarity index 60% rename from src/main/java/edu/berkeley/path/ModelElements/Network.java rename to src/main/java/edu/berkeley/path/model_elements/Network.java index 772f37f..453d6cf 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/Network.java +++ b/src/main/java/edu/berkeley/path/model_elements/Network.java @@ -3,14 +3,14 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") public class Network extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Network\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"default\":\"1\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"nodes\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"Node\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"}]}},\"default\":[]},{\"name\":\"links\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"Link\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"},{\"name\":\"laneCount\",\"type\":\"double\"},{\"name\":\"length\",\"type\":\"double\"},{\"name\":\"laneOffset\",\"type\":\"int\",\"default\":0},{\"name\":\"begin\",\"type\":{\"type\":\"record\",\"name\":\"NodeRef\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]}},{\"name\":\"end\",\"type\":\"NodeRef\"}]}},\"default\":[]}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Network\",\"namespace\":\"edu.berkeley.path.model_elements\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"default\":\"1\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"nodes\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"Node\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"}]}},\"default\":[]},{\"name\":\"links\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"Link\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"},{\"name\":\"laneCount\",\"type\":\"double\"},{\"name\":\"length\",\"type\":\"double\"},{\"name\":\"laneOffset\",\"type\":\"int\",\"default\":0},{\"name\":\"begin\",\"type\":{\"type\":\"record\",\"name\":\"NodeRef\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]}},{\"name\":\"end\",\"type\":\"NodeRef\"}]}},\"default\":[]}]}"); @Deprecated public java.lang.CharSequence id; @Deprecated public java.lang.CharSequence name; - @Deprecated public java.util.List nodes; - @Deprecated public java.util.List links; + @Deprecated public java.util.List nodes; + @Deprecated public java.util.List links; public org.apache.avro.Schema getSchema() { return SCHEMA$; } // Used by DatumWriter. Applications should not call. public java.lang.Object get(int field$) { @@ -28,8 +28,8 @@ public void put(int field$, java.lang.Object value$) { switch (field$) { case 0: id = (java.lang.CharSequence)value$; break; case 1: name = (java.lang.CharSequence)value$; break; - case 2: nodes = (java.util.List)value$; break; - case 3: links = (java.util.List)value$; break; + case 2: nodes = (java.util.List)value$; break; + case 3: links = (java.util.List)value$; break; default: throw new org.apache.avro.AvroRuntimeException("Bad index"); } } @@ -67,7 +67,7 @@ public void setName(java.lang.CharSequence value) { /** * Gets the value of the 'nodes' field. */ - public java.util.List getNodes() { + public java.util.List getNodes() { return nodes; } @@ -75,14 +75,14 @@ public java.util.List getNodes() { * Sets the value of the 'nodes' field. * @param value the value to set. */ - public void setNodes(java.util.List value) { + public void setNodes(java.util.List value) { this.nodes = value; } /** * Gets the value of the 'links' field. */ - public java.util.List getLinks() { + public java.util.List getLinks() { return links; } @@ -90,23 +90,23 @@ public java.util.List getLinks() { * Sets the value of the 'links' field. * @param value the value to set. */ - public void setLinks(java.util.List value) { + public void setLinks(java.util.List value) { this.links = value; } /** Creates a new Network RecordBuilder */ - public static edu.berkeley.path.ModelElements.Network.Builder newBuilder() { - return new edu.berkeley.path.ModelElements.Network.Builder(); + public static edu.berkeley.path.model_elements.Network.Builder newBuilder() { + return new edu.berkeley.path.model_elements.Network.Builder(); } /** Creates a new Network RecordBuilder by copying an existing Builder */ - public static edu.berkeley.path.ModelElements.Network.Builder newBuilder(edu.berkeley.path.ModelElements.Network.Builder other) { - return new edu.berkeley.path.ModelElements.Network.Builder(other); + public static edu.berkeley.path.model_elements.Network.Builder newBuilder(edu.berkeley.path.model_elements.Network.Builder other) { + return new edu.berkeley.path.model_elements.Network.Builder(other); } /** Creates a new Network RecordBuilder by copying an existing Network instance */ - public static edu.berkeley.path.ModelElements.Network.Builder newBuilder(edu.berkeley.path.ModelElements.Network other) { - return new edu.berkeley.path.ModelElements.Network.Builder(other); + public static edu.berkeley.path.model_elements.Network.Builder newBuilder(edu.berkeley.path.model_elements.Network other) { + return new edu.berkeley.path.model_elements.Network.Builder(other); } /** @@ -117,22 +117,22 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild private java.lang.CharSequence id; private java.lang.CharSequence name; - private java.util.List nodes; - private java.util.List links; + private java.util.List nodes; + private java.util.List links; /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.Network.SCHEMA$); + super(edu.berkeley.path.model_elements.Network.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.Network.Builder other) { + private Builder(edu.berkeley.path.model_elements.Network.Builder other) { super(other); } /** Creates a Builder by copying an existing Network instance */ - private Builder(edu.berkeley.path.ModelElements.Network other) { - super(edu.berkeley.path.ModelElements.Network.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.Network other) { + super(edu.berkeley.path.model_elements.Network.SCHEMA$); if (isValidValue(fields()[0], other.id)) { this.id = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.id); fieldSetFlags()[0] = true; @@ -142,11 +142,11 @@ private Builder(edu.berkeley.path.ModelElements.Network other) { fieldSetFlags()[1] = true; } if (isValidValue(fields()[2], other.nodes)) { - this.nodes = (java.util.List) data().deepCopy(fields()[2].schema(), other.nodes); + this.nodes = (java.util.List) data().deepCopy(fields()[2].schema(), other.nodes); fieldSetFlags()[2] = true; } if (isValidValue(fields()[3], other.links)) { - this.links = (java.util.List) data().deepCopy(fields()[3].schema(), other.links); + this.links = (java.util.List) data().deepCopy(fields()[3].schema(), other.links); fieldSetFlags()[3] = true; } } @@ -157,7 +157,7 @@ public java.lang.CharSequence getId() { } /** Sets the value of the 'id' field */ - public edu.berkeley.path.ModelElements.Network.Builder setId(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.Network.Builder setId(java.lang.CharSequence value) { validate(fields()[0], value); this.id = value; fieldSetFlags()[0] = true; @@ -170,7 +170,7 @@ public boolean hasId() { } /** Clears the value of the 'id' field */ - public edu.berkeley.path.ModelElements.Network.Builder clearId() { + public edu.berkeley.path.model_elements.Network.Builder clearId() { id = null; fieldSetFlags()[0] = false; return this; @@ -182,7 +182,7 @@ public java.lang.CharSequence getName() { } /** Sets the value of the 'name' field */ - public edu.berkeley.path.ModelElements.Network.Builder setName(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.Network.Builder setName(java.lang.CharSequence value) { validate(fields()[1], value); this.name = value; fieldSetFlags()[1] = true; @@ -195,19 +195,19 @@ public boolean hasName() { } /** Clears the value of the 'name' field */ - public edu.berkeley.path.ModelElements.Network.Builder clearName() { + public edu.berkeley.path.model_elements.Network.Builder clearName() { name = null; fieldSetFlags()[1] = false; return this; } /** Gets the value of the 'nodes' field */ - public java.util.List getNodes() { + public java.util.List getNodes() { return nodes; } /** Sets the value of the 'nodes' field */ - public edu.berkeley.path.ModelElements.Network.Builder setNodes(java.util.List value) { + public edu.berkeley.path.model_elements.Network.Builder setNodes(java.util.List value) { validate(fields()[2], value); this.nodes = value; fieldSetFlags()[2] = true; @@ -220,19 +220,19 @@ public boolean hasNodes() { } /** Clears the value of the 'nodes' field */ - public edu.berkeley.path.ModelElements.Network.Builder clearNodes() { + public edu.berkeley.path.model_elements.Network.Builder clearNodes() { nodes = null; fieldSetFlags()[2] = false; return this; } /** Gets the value of the 'links' field */ - public java.util.List getLinks() { + public java.util.List getLinks() { return links; } /** Sets the value of the 'links' field */ - public edu.berkeley.path.ModelElements.Network.Builder setLinks(java.util.List value) { + public edu.berkeley.path.model_elements.Network.Builder setLinks(java.util.List value) { validate(fields()[3], value); this.links = value; fieldSetFlags()[3] = true; @@ -245,7 +245,7 @@ public boolean hasLinks() { } /** Clears the value of the 'links' field */ - public edu.berkeley.path.ModelElements.Network.Builder clearLinks() { + public edu.berkeley.path.model_elements.Network.Builder clearLinks() { links = null; fieldSetFlags()[3] = false; return this; @@ -257,8 +257,8 @@ public Network build() { Network record = new Network(); record.id = fieldSetFlags()[0] ? this.id : (java.lang.CharSequence) defaultValue(fields()[0]); record.name = fieldSetFlags()[1] ? this.name : (java.lang.CharSequence) defaultValue(fields()[1]); - record.nodes = fieldSetFlags()[2] ? this.nodes : (java.util.List) defaultValue(fields()[2]); - record.links = fieldSetFlags()[3] ? this.links : (java.util.List) defaultValue(fields()[3]); + record.nodes = fieldSetFlags()[2] ? this.nodes : (java.util.List) defaultValue(fields()[2]); + record.links = fieldSetFlags()[3] ? this.links : (java.util.List) defaultValue(fields()[3]); return record; } catch (Exception e) { throw new org.apache.avro.AvroRuntimeException(e); diff --git a/src/main/java/edu/berkeley/path/ModelElements/NetworkRef.java b/src/main/java/edu/berkeley/path/model_elements/NetworkRef.java similarity index 72% rename from src/main/java/edu/berkeley/path/ModelElements/NetworkRef.java rename to src/main/java/edu/berkeley/path/model_elements/NetworkRef.java index 6a3baa6..ba23c58 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/NetworkRef.java +++ b/src/main/java/edu/berkeley/path/model_elements/NetworkRef.java @@ -3,10 +3,10 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") public class NetworkRef extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"NetworkRef\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"fields\":[{\"name\":\"networkId\",\"type\":\"string\"}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"NetworkRef\",\"namespace\":\"edu.berkeley.path.model_elements\",\"fields\":[{\"name\":\"networkId\",\"type\":\"string\"}]}"); @Deprecated public java.lang.CharSequence networkId; public org.apache.avro.Schema getSchema() { return SCHEMA$; } // Used by DatumWriter. Applications should not call. @@ -41,18 +41,18 @@ public void setNetworkId(java.lang.CharSequence value) { } /** Creates a new NetworkRef RecordBuilder */ - public static edu.berkeley.path.ModelElements.NetworkRef.Builder newBuilder() { - return new edu.berkeley.path.ModelElements.NetworkRef.Builder(); + public static edu.berkeley.path.model_elements.NetworkRef.Builder newBuilder() { + return new edu.berkeley.path.model_elements.NetworkRef.Builder(); } /** Creates a new NetworkRef RecordBuilder by copying an existing Builder */ - public static edu.berkeley.path.ModelElements.NetworkRef.Builder newBuilder(edu.berkeley.path.ModelElements.NetworkRef.Builder other) { - return new edu.berkeley.path.ModelElements.NetworkRef.Builder(other); + public static edu.berkeley.path.model_elements.NetworkRef.Builder newBuilder(edu.berkeley.path.model_elements.NetworkRef.Builder other) { + return new edu.berkeley.path.model_elements.NetworkRef.Builder(other); } /** Creates a new NetworkRef RecordBuilder by copying an existing NetworkRef instance */ - public static edu.berkeley.path.ModelElements.NetworkRef.Builder newBuilder(edu.berkeley.path.ModelElements.NetworkRef other) { - return new edu.berkeley.path.ModelElements.NetworkRef.Builder(other); + public static edu.berkeley.path.model_elements.NetworkRef.Builder newBuilder(edu.berkeley.path.model_elements.NetworkRef other) { + return new edu.berkeley.path.model_elements.NetworkRef.Builder(other); } /** @@ -65,17 +65,17 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.NetworkRef.SCHEMA$); + super(edu.berkeley.path.model_elements.NetworkRef.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.NetworkRef.Builder other) { + private Builder(edu.berkeley.path.model_elements.NetworkRef.Builder other) { super(other); } /** Creates a Builder by copying an existing NetworkRef instance */ - private Builder(edu.berkeley.path.ModelElements.NetworkRef other) { - super(edu.berkeley.path.ModelElements.NetworkRef.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.NetworkRef other) { + super(edu.berkeley.path.model_elements.NetworkRef.SCHEMA$); if (isValidValue(fields()[0], other.networkId)) { this.networkId = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.networkId); fieldSetFlags()[0] = true; @@ -88,7 +88,7 @@ public java.lang.CharSequence getNetworkId() { } /** Sets the value of the 'networkId' field */ - public edu.berkeley.path.ModelElements.NetworkRef.Builder setNetworkId(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.NetworkRef.Builder setNetworkId(java.lang.CharSequence value) { validate(fields()[0], value); this.networkId = value; fieldSetFlags()[0] = true; @@ -101,7 +101,7 @@ public boolean hasNetworkId() { } /** Clears the value of the 'networkId' field */ - public edu.berkeley.path.ModelElements.NetworkRef.Builder clearNetworkId() { + public edu.berkeley.path.model_elements.NetworkRef.Builder clearNetworkId() { networkId = null; fieldSetFlags()[0] = false; return this; diff --git a/src/main/java/edu/berkeley/path/ModelElements/Node.java b/src/main/java/edu/berkeley/path/model_elements/Node.java similarity index 78% rename from src/main/java/edu/berkeley/path/ModelElements/Node.java rename to src/main/java/edu/berkeley/path/model_elements/Node.java index 24dfb4e..4c23f10 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/Node.java +++ b/src/main/java/edu/berkeley/path/model_elements/Node.java @@ -3,10 +3,10 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") public class Node extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Node\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Node\",\"namespace\":\"edu.berkeley.path.model_elements\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"}]}"); @Deprecated public java.lang.CharSequence id; @Deprecated public java.lang.CharSequence name; @Deprecated public java.lang.CharSequence type; @@ -77,18 +77,18 @@ public void setType(java.lang.CharSequence value) { } /** Creates a new Node RecordBuilder */ - public static edu.berkeley.path.ModelElements.Node.Builder newBuilder() { - return new edu.berkeley.path.ModelElements.Node.Builder(); + public static edu.berkeley.path.model_elements.Node.Builder newBuilder() { + return new edu.berkeley.path.model_elements.Node.Builder(); } /** Creates a new Node RecordBuilder by copying an existing Builder */ - public static edu.berkeley.path.ModelElements.Node.Builder newBuilder(edu.berkeley.path.ModelElements.Node.Builder other) { - return new edu.berkeley.path.ModelElements.Node.Builder(other); + public static edu.berkeley.path.model_elements.Node.Builder newBuilder(edu.berkeley.path.model_elements.Node.Builder other) { + return new edu.berkeley.path.model_elements.Node.Builder(other); } /** Creates a new Node RecordBuilder by copying an existing Node instance */ - public static edu.berkeley.path.ModelElements.Node.Builder newBuilder(edu.berkeley.path.ModelElements.Node other) { - return new edu.berkeley.path.ModelElements.Node.Builder(other); + public static edu.berkeley.path.model_elements.Node.Builder newBuilder(edu.berkeley.path.model_elements.Node other) { + return new edu.berkeley.path.model_elements.Node.Builder(other); } /** @@ -103,17 +103,17 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.Node.SCHEMA$); + super(edu.berkeley.path.model_elements.Node.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.Node.Builder other) { + private Builder(edu.berkeley.path.model_elements.Node.Builder other) { super(other); } /** Creates a Builder by copying an existing Node instance */ - private Builder(edu.berkeley.path.ModelElements.Node other) { - super(edu.berkeley.path.ModelElements.Node.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.Node other) { + super(edu.berkeley.path.model_elements.Node.SCHEMA$); if (isValidValue(fields()[0], other.id)) { this.id = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.id); fieldSetFlags()[0] = true; @@ -134,7 +134,7 @@ public java.lang.CharSequence getId() { } /** Sets the value of the 'id' field */ - public edu.berkeley.path.ModelElements.Node.Builder setId(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.Node.Builder setId(java.lang.CharSequence value) { validate(fields()[0], value); this.id = value; fieldSetFlags()[0] = true; @@ -147,7 +147,7 @@ public boolean hasId() { } /** Clears the value of the 'id' field */ - public edu.berkeley.path.ModelElements.Node.Builder clearId() { + public edu.berkeley.path.model_elements.Node.Builder clearId() { id = null; fieldSetFlags()[0] = false; return this; @@ -159,7 +159,7 @@ public java.lang.CharSequence getName() { } /** Sets the value of the 'name' field */ - public edu.berkeley.path.ModelElements.Node.Builder setName(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.Node.Builder setName(java.lang.CharSequence value) { validate(fields()[1], value); this.name = value; fieldSetFlags()[1] = true; @@ -172,7 +172,7 @@ public boolean hasName() { } /** Clears the value of the 'name' field */ - public edu.berkeley.path.ModelElements.Node.Builder clearName() { + public edu.berkeley.path.model_elements.Node.Builder clearName() { name = null; fieldSetFlags()[1] = false; return this; @@ -184,7 +184,7 @@ public java.lang.CharSequence getType() { } /** Sets the value of the 'type' field */ - public edu.berkeley.path.ModelElements.Node.Builder setType(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.Node.Builder setType(java.lang.CharSequence value) { validate(fields()[2], value); this.type = value; fieldSetFlags()[2] = true; @@ -197,7 +197,7 @@ public boolean hasType() { } /** Clears the value of the 'type' field */ - public edu.berkeley.path.ModelElements.Node.Builder clearType() { + public edu.berkeley.path.model_elements.Node.Builder clearType() { type = null; fieldSetFlags()[2] = false; return this; diff --git a/src/main/java/edu/berkeley/path/ModelElements/NodeRef.java b/src/main/java/edu/berkeley/path/model_elements/NodeRef.java similarity index 72% rename from src/main/java/edu/berkeley/path/ModelElements/NodeRef.java rename to src/main/java/edu/berkeley/path/model_elements/NodeRef.java index b4cad47..6a399aa 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/NodeRef.java +++ b/src/main/java/edu/berkeley/path/model_elements/NodeRef.java @@ -3,10 +3,10 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") public class NodeRef extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"NodeRef\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"NodeRef\",\"namespace\":\"edu.berkeley.path.model_elements\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]}"); @Deprecated public java.lang.CharSequence nodeId; public org.apache.avro.Schema getSchema() { return SCHEMA$; } // Used by DatumWriter. Applications should not call. @@ -41,18 +41,18 @@ public void setNodeId(java.lang.CharSequence value) { } /** Creates a new NodeRef RecordBuilder */ - public static edu.berkeley.path.ModelElements.NodeRef.Builder newBuilder() { - return new edu.berkeley.path.ModelElements.NodeRef.Builder(); + public static edu.berkeley.path.model_elements.NodeRef.Builder newBuilder() { + return new edu.berkeley.path.model_elements.NodeRef.Builder(); } /** Creates a new NodeRef RecordBuilder by copying an existing Builder */ - public static edu.berkeley.path.ModelElements.NodeRef.Builder newBuilder(edu.berkeley.path.ModelElements.NodeRef.Builder other) { - return new edu.berkeley.path.ModelElements.NodeRef.Builder(other); + public static edu.berkeley.path.model_elements.NodeRef.Builder newBuilder(edu.berkeley.path.model_elements.NodeRef.Builder other) { + return new edu.berkeley.path.model_elements.NodeRef.Builder(other); } /** Creates a new NodeRef RecordBuilder by copying an existing NodeRef instance */ - public static edu.berkeley.path.ModelElements.NodeRef.Builder newBuilder(edu.berkeley.path.ModelElements.NodeRef other) { - return new edu.berkeley.path.ModelElements.NodeRef.Builder(other); + public static edu.berkeley.path.model_elements.NodeRef.Builder newBuilder(edu.berkeley.path.model_elements.NodeRef other) { + return new edu.berkeley.path.model_elements.NodeRef.Builder(other); } /** @@ -65,17 +65,17 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.NodeRef.SCHEMA$); + super(edu.berkeley.path.model_elements.NodeRef.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.NodeRef.Builder other) { + private Builder(edu.berkeley.path.model_elements.NodeRef.Builder other) { super(other); } /** Creates a Builder by copying an existing NodeRef instance */ - private Builder(edu.berkeley.path.ModelElements.NodeRef other) { - super(edu.berkeley.path.ModelElements.NodeRef.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.NodeRef other) { + super(edu.berkeley.path.model_elements.NodeRef.SCHEMA$); if (isValidValue(fields()[0], other.nodeId)) { this.nodeId = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.nodeId); fieldSetFlags()[0] = true; @@ -88,7 +88,7 @@ public java.lang.CharSequence getNodeId() { } /** Sets the value of the 'nodeId' field */ - public edu.berkeley.path.ModelElements.NodeRef.Builder setNodeId(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.NodeRef.Builder setNodeId(java.lang.CharSequence value) { validate(fields()[0], value); this.nodeId = value; fieldSetFlags()[0] = true; @@ -101,7 +101,7 @@ public boolean hasNodeId() { } /** Clears the value of the 'nodeId' field */ - public edu.berkeley.path.ModelElements.NodeRef.Builder clearNodeId() { + public edu.berkeley.path.model_elements.NodeRef.Builder clearNodeId() { nodeId = null; fieldSetFlags()[0] = false; return this; diff --git a/src/main/java/edu/berkeley/path/ModelElements/Scenario.java b/src/main/java/edu/berkeley/path/model_elements/Scenario.java similarity index 51% rename from src/main/java/edu/berkeley/path/ModelElements/Scenario.java rename to src/main/java/edu/berkeley/path/model_elements/Scenario.java index f2e2699..7bd2cfb 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/Scenario.java +++ b/src/main/java/edu/berkeley/path/model_elements/Scenario.java @@ -3,16 +3,16 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") public class Scenario extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Scenario\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"network\",\"type\":{\"type\":\"record\",\"name\":\"Network\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"default\":\"1\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"nodes\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"Node\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"}]}},\"default\":[]},{\"name\":\"links\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"Link\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"},{\"name\":\"laneCount\",\"type\":\"double\"},{\"name\":\"length\",\"type\":\"double\"},{\"name\":\"laneOffset\",\"type\":\"int\",\"default\":0},{\"name\":\"begin\",\"type\":{\"type\":\"record\",\"name\":\"NodeRef\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]}},{\"name\":\"end\",\"type\":\"NodeRef\"}]}},\"default\":[]}]}},{\"name\":\"initialDensityProfile\",\"type\":{\"type\":\"record\",\"name\":\"DensityProfile\",\"doc\":\"Density on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"vehiclesPerMeter\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]}},{\"name\":\"fdProfile\",\"type\":{\"type\":\"record\",\"name\":\"FDProfile\",\"doc\":\"Fundamental diagrams on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"fd\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"FD\",\"doc\":\"Fundamental diagram on one link at one time\",\"fields\":[{\"name\":\"freeFlowSpeed\",\"type\":\"double\"},{\"name\":\"freeFlowSpeedStdev\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeed\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeedStdev\",\"type\":\"double\"},{\"name\":\"capacity\",\"type\":\"double\"},{\"name\":\"capacityStdev\",\"type\":\"double\"},{\"name\":\"jamDensity\",\"type\":\"double\"},{\"name\":\"capacityDrop\",\"type\":\"double\"}]}}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]}},{\"name\":\"demandProfile\",\"type\":{\"type\":\"record\",\"name\":\"DemandProfile\",\"doc\":\"Demands on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"origin\",\"type\":{\"type\":\"record\",\"name\":\"LinkRef\",\"fields\":[{\"name\":\"linkId\",\"type\":\"string\"}]},\"doc\":\"may not be null\"},{\"name\":\"destination\",\"type\":\"LinkRef\",\"doc\":\"may be null\"},{\"name\":\"demand\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]}}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Scenario\",\"namespace\":\"edu.berkeley.path.model_elements\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"network\",\"type\":{\"type\":\"record\",\"name\":\"Network\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"default\":\"1\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"nodes\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"Node\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"}]}},\"default\":[]},{\"name\":\"links\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"Link\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"},{\"name\":\"laneCount\",\"type\":\"double\"},{\"name\":\"length\",\"type\":\"double\"},{\"name\":\"laneOffset\",\"type\":\"int\",\"default\":0},{\"name\":\"begin\",\"type\":{\"type\":\"record\",\"name\":\"NodeRef\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]}},{\"name\":\"end\",\"type\":\"NodeRef\"}]}},\"default\":[]}]}},{\"name\":\"initialDensityProfile\",\"type\":{\"type\":\"record\",\"name\":\"DensityProfile\",\"doc\":\"Density on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"vehiclesPerMeter\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]}},{\"name\":\"fdProfile\",\"type\":{\"type\":\"record\",\"name\":\"FDProfile\",\"doc\":\"Fundamental diagrams on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"fd\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"FD\",\"doc\":\"Fundamental diagram on one link at one time\",\"fields\":[{\"name\":\"freeFlowSpeed\",\"type\":\"double\"},{\"name\":\"freeFlowSpeedStdev\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeed\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeedStdev\",\"type\":\"double\"},{\"name\":\"capacity\",\"type\":\"double\"},{\"name\":\"capacityStdev\",\"type\":\"double\"},{\"name\":\"jamDensity\",\"type\":\"double\"},{\"name\":\"capacityDrop\",\"type\":\"double\"}]}}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]}},{\"name\":\"demandProfile\",\"type\":{\"type\":\"record\",\"name\":\"DemandProfile\",\"doc\":\"Demands on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"origin\",\"type\":{\"type\":\"record\",\"name\":\"LinkRef\",\"fields\":[{\"name\":\"linkId\",\"type\":\"string\"}]},\"doc\":\"may not be null\"},{\"name\":\"destination\",\"type\":\"LinkRef\",\"doc\":\"may be null\"},{\"name\":\"demand\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]}}]}"); @Deprecated public java.lang.CharSequence id; @Deprecated public java.lang.CharSequence name; - @Deprecated public edu.berkeley.path.ModelElements.Network network; - @Deprecated public edu.berkeley.path.ModelElements.DensityProfile initialDensityProfile; - @Deprecated public edu.berkeley.path.ModelElements.FDProfile fdProfile; - @Deprecated public edu.berkeley.path.ModelElements.DemandProfile demandProfile; + @Deprecated public edu.berkeley.path.model_elements.Network network; + @Deprecated public edu.berkeley.path.model_elements.DensityProfile initialDensityProfile; + @Deprecated public edu.berkeley.path.model_elements.FDProfile fdProfile; + @Deprecated public edu.berkeley.path.model_elements.DemandProfile demandProfile; public org.apache.avro.Schema getSchema() { return SCHEMA$; } // Used by DatumWriter. Applications should not call. public java.lang.Object get(int field$) { @@ -32,10 +32,10 @@ public void put(int field$, java.lang.Object value$) { switch (field$) { case 0: id = (java.lang.CharSequence)value$; break; case 1: name = (java.lang.CharSequence)value$; break; - case 2: network = (edu.berkeley.path.ModelElements.Network)value$; break; - case 3: initialDensityProfile = (edu.berkeley.path.ModelElements.DensityProfile)value$; break; - case 4: fdProfile = (edu.berkeley.path.ModelElements.FDProfile)value$; break; - case 5: demandProfile = (edu.berkeley.path.ModelElements.DemandProfile)value$; break; + case 2: network = (edu.berkeley.path.model_elements.Network)value$; break; + case 3: initialDensityProfile = (edu.berkeley.path.model_elements.DensityProfile)value$; break; + case 4: fdProfile = (edu.berkeley.path.model_elements.FDProfile)value$; break; + case 5: demandProfile = (edu.berkeley.path.model_elements.DemandProfile)value$; break; default: throw new org.apache.avro.AvroRuntimeException("Bad index"); } } @@ -73,7 +73,7 @@ public void setName(java.lang.CharSequence value) { /** * Gets the value of the 'network' field. */ - public edu.berkeley.path.ModelElements.Network getNetwork() { + public edu.berkeley.path.model_elements.Network getNetwork() { return network; } @@ -81,14 +81,14 @@ public edu.berkeley.path.ModelElements.Network getNetwork() { * Sets the value of the 'network' field. * @param value the value to set. */ - public void setNetwork(edu.berkeley.path.ModelElements.Network value) { + public void setNetwork(edu.berkeley.path.model_elements.Network value) { this.network = value; } /** * Gets the value of the 'initialDensityProfile' field. */ - public edu.berkeley.path.ModelElements.DensityProfile getInitialDensityProfile() { + public edu.berkeley.path.model_elements.DensityProfile getInitialDensityProfile() { return initialDensityProfile; } @@ -96,14 +96,14 @@ public edu.berkeley.path.ModelElements.DensityProfile getInitialDensityProfile() * Sets the value of the 'initialDensityProfile' field. * @param value the value to set. */ - public void setInitialDensityProfile(edu.berkeley.path.ModelElements.DensityProfile value) { + public void setInitialDensityProfile(edu.berkeley.path.model_elements.DensityProfile value) { this.initialDensityProfile = value; } /** * Gets the value of the 'fdProfile' field. */ - public edu.berkeley.path.ModelElements.FDProfile getFdProfile() { + public edu.berkeley.path.model_elements.FDProfile getFdProfile() { return fdProfile; } @@ -111,14 +111,14 @@ public edu.berkeley.path.ModelElements.FDProfile getFdProfile() { * Sets the value of the 'fdProfile' field. * @param value the value to set. */ - public void setFdProfile(edu.berkeley.path.ModelElements.FDProfile value) { + public void setFdProfile(edu.berkeley.path.model_elements.FDProfile value) { this.fdProfile = value; } /** * Gets the value of the 'demandProfile' field. */ - public edu.berkeley.path.ModelElements.DemandProfile getDemandProfile() { + public edu.berkeley.path.model_elements.DemandProfile getDemandProfile() { return demandProfile; } @@ -126,23 +126,23 @@ public edu.berkeley.path.ModelElements.DemandProfile getDemandProfile() { * Sets the value of the 'demandProfile' field. * @param value the value to set. */ - public void setDemandProfile(edu.berkeley.path.ModelElements.DemandProfile value) { + public void setDemandProfile(edu.berkeley.path.model_elements.DemandProfile value) { this.demandProfile = value; } /** Creates a new Scenario RecordBuilder */ - public static edu.berkeley.path.ModelElements.Scenario.Builder newBuilder() { - return new edu.berkeley.path.ModelElements.Scenario.Builder(); + public static edu.berkeley.path.model_elements.Scenario.Builder newBuilder() { + return new edu.berkeley.path.model_elements.Scenario.Builder(); } /** Creates a new Scenario RecordBuilder by copying an existing Builder */ - public static edu.berkeley.path.ModelElements.Scenario.Builder newBuilder(edu.berkeley.path.ModelElements.Scenario.Builder other) { - return new edu.berkeley.path.ModelElements.Scenario.Builder(other); + public static edu.berkeley.path.model_elements.Scenario.Builder newBuilder(edu.berkeley.path.model_elements.Scenario.Builder other) { + return new edu.berkeley.path.model_elements.Scenario.Builder(other); } /** Creates a new Scenario RecordBuilder by copying an existing Scenario instance */ - public static edu.berkeley.path.ModelElements.Scenario.Builder newBuilder(edu.berkeley.path.ModelElements.Scenario other) { - return new edu.berkeley.path.ModelElements.Scenario.Builder(other); + public static edu.berkeley.path.model_elements.Scenario.Builder newBuilder(edu.berkeley.path.model_elements.Scenario other) { + return new edu.berkeley.path.model_elements.Scenario.Builder(other); } /** @@ -153,24 +153,24 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild private java.lang.CharSequence id; private java.lang.CharSequence name; - private edu.berkeley.path.ModelElements.Network network; - private edu.berkeley.path.ModelElements.DensityProfile initialDensityProfile; - private edu.berkeley.path.ModelElements.FDProfile fdProfile; - private edu.berkeley.path.ModelElements.DemandProfile demandProfile; + private edu.berkeley.path.model_elements.Network network; + private edu.berkeley.path.model_elements.DensityProfile initialDensityProfile; + private edu.berkeley.path.model_elements.FDProfile fdProfile; + private edu.berkeley.path.model_elements.DemandProfile demandProfile; /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.Scenario.SCHEMA$); + super(edu.berkeley.path.model_elements.Scenario.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.Scenario.Builder other) { + private Builder(edu.berkeley.path.model_elements.Scenario.Builder other) { super(other); } /** Creates a Builder by copying an existing Scenario instance */ - private Builder(edu.berkeley.path.ModelElements.Scenario other) { - super(edu.berkeley.path.ModelElements.Scenario.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.Scenario other) { + super(edu.berkeley.path.model_elements.Scenario.SCHEMA$); if (isValidValue(fields()[0], other.id)) { this.id = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.id); fieldSetFlags()[0] = true; @@ -180,19 +180,19 @@ private Builder(edu.berkeley.path.ModelElements.Scenario other) { fieldSetFlags()[1] = true; } if (isValidValue(fields()[2], other.network)) { - this.network = (edu.berkeley.path.ModelElements.Network) data().deepCopy(fields()[2].schema(), other.network); + this.network = (edu.berkeley.path.model_elements.Network) data().deepCopy(fields()[2].schema(), other.network); fieldSetFlags()[2] = true; } if (isValidValue(fields()[3], other.initialDensityProfile)) { - this.initialDensityProfile = (edu.berkeley.path.ModelElements.DensityProfile) data().deepCopy(fields()[3].schema(), other.initialDensityProfile); + this.initialDensityProfile = (edu.berkeley.path.model_elements.DensityProfile) data().deepCopy(fields()[3].schema(), other.initialDensityProfile); fieldSetFlags()[3] = true; } if (isValidValue(fields()[4], other.fdProfile)) { - this.fdProfile = (edu.berkeley.path.ModelElements.FDProfile) data().deepCopy(fields()[4].schema(), other.fdProfile); + this.fdProfile = (edu.berkeley.path.model_elements.FDProfile) data().deepCopy(fields()[4].schema(), other.fdProfile); fieldSetFlags()[4] = true; } if (isValidValue(fields()[5], other.demandProfile)) { - this.demandProfile = (edu.berkeley.path.ModelElements.DemandProfile) data().deepCopy(fields()[5].schema(), other.demandProfile); + this.demandProfile = (edu.berkeley.path.model_elements.DemandProfile) data().deepCopy(fields()[5].schema(), other.demandProfile); fieldSetFlags()[5] = true; } } @@ -203,7 +203,7 @@ public java.lang.CharSequence getId() { } /** Sets the value of the 'id' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder setId(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.Scenario.Builder setId(java.lang.CharSequence value) { validate(fields()[0], value); this.id = value; fieldSetFlags()[0] = true; @@ -216,7 +216,7 @@ public boolean hasId() { } /** Clears the value of the 'id' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder clearId() { + public edu.berkeley.path.model_elements.Scenario.Builder clearId() { id = null; fieldSetFlags()[0] = false; return this; @@ -228,7 +228,7 @@ public java.lang.CharSequence getName() { } /** Sets the value of the 'name' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder setName(java.lang.CharSequence value) { + public edu.berkeley.path.model_elements.Scenario.Builder setName(java.lang.CharSequence value) { validate(fields()[1], value); this.name = value; fieldSetFlags()[1] = true; @@ -241,19 +241,19 @@ public boolean hasName() { } /** Clears the value of the 'name' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder clearName() { + public edu.berkeley.path.model_elements.Scenario.Builder clearName() { name = null; fieldSetFlags()[1] = false; return this; } /** Gets the value of the 'network' field */ - public edu.berkeley.path.ModelElements.Network getNetwork() { + public edu.berkeley.path.model_elements.Network getNetwork() { return network; } /** Sets the value of the 'network' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder setNetwork(edu.berkeley.path.ModelElements.Network value) { + public edu.berkeley.path.model_elements.Scenario.Builder setNetwork(edu.berkeley.path.model_elements.Network value) { validate(fields()[2], value); this.network = value; fieldSetFlags()[2] = true; @@ -266,19 +266,19 @@ public boolean hasNetwork() { } /** Clears the value of the 'network' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder clearNetwork() { + public edu.berkeley.path.model_elements.Scenario.Builder clearNetwork() { network = null; fieldSetFlags()[2] = false; return this; } /** Gets the value of the 'initialDensityProfile' field */ - public edu.berkeley.path.ModelElements.DensityProfile getInitialDensityProfile() { + public edu.berkeley.path.model_elements.DensityProfile getInitialDensityProfile() { return initialDensityProfile; } /** Sets the value of the 'initialDensityProfile' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder setInitialDensityProfile(edu.berkeley.path.ModelElements.DensityProfile value) { + public edu.berkeley.path.model_elements.Scenario.Builder setInitialDensityProfile(edu.berkeley.path.model_elements.DensityProfile value) { validate(fields()[3], value); this.initialDensityProfile = value; fieldSetFlags()[3] = true; @@ -291,19 +291,19 @@ public boolean hasInitialDensityProfile() { } /** Clears the value of the 'initialDensityProfile' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder clearInitialDensityProfile() { + public edu.berkeley.path.model_elements.Scenario.Builder clearInitialDensityProfile() { initialDensityProfile = null; fieldSetFlags()[3] = false; return this; } /** Gets the value of the 'fdProfile' field */ - public edu.berkeley.path.ModelElements.FDProfile getFdProfile() { + public edu.berkeley.path.model_elements.FDProfile getFdProfile() { return fdProfile; } /** Sets the value of the 'fdProfile' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder setFdProfile(edu.berkeley.path.ModelElements.FDProfile value) { + public edu.berkeley.path.model_elements.Scenario.Builder setFdProfile(edu.berkeley.path.model_elements.FDProfile value) { validate(fields()[4], value); this.fdProfile = value; fieldSetFlags()[4] = true; @@ -316,19 +316,19 @@ public boolean hasFdProfile() { } /** Clears the value of the 'fdProfile' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder clearFdProfile() { + public edu.berkeley.path.model_elements.Scenario.Builder clearFdProfile() { fdProfile = null; fieldSetFlags()[4] = false; return this; } /** Gets the value of the 'demandProfile' field */ - public edu.berkeley.path.ModelElements.DemandProfile getDemandProfile() { + public edu.berkeley.path.model_elements.DemandProfile getDemandProfile() { return demandProfile; } /** Sets the value of the 'demandProfile' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder setDemandProfile(edu.berkeley.path.ModelElements.DemandProfile value) { + public edu.berkeley.path.model_elements.Scenario.Builder setDemandProfile(edu.berkeley.path.model_elements.DemandProfile value) { validate(fields()[5], value); this.demandProfile = value; fieldSetFlags()[5] = true; @@ -341,7 +341,7 @@ public boolean hasDemandProfile() { } /** Clears the value of the 'demandProfile' field */ - public edu.berkeley.path.ModelElements.Scenario.Builder clearDemandProfile() { + public edu.berkeley.path.model_elements.Scenario.Builder clearDemandProfile() { demandProfile = null; fieldSetFlags()[5] = false; return this; @@ -353,10 +353,10 @@ public Scenario build() { Scenario record = new Scenario(); record.id = fieldSetFlags()[0] ? this.id : (java.lang.CharSequence) defaultValue(fields()[0]); record.name = fieldSetFlags()[1] ? this.name : (java.lang.CharSequence) defaultValue(fields()[1]); - record.network = fieldSetFlags()[2] ? this.network : (edu.berkeley.path.ModelElements.Network) defaultValue(fields()[2]); - record.initialDensityProfile = fieldSetFlags()[3] ? this.initialDensityProfile : (edu.berkeley.path.ModelElements.DensityProfile) defaultValue(fields()[3]); - record.fdProfile = fieldSetFlags()[4] ? this.fdProfile : (edu.berkeley.path.ModelElements.FDProfile) defaultValue(fields()[4]); - record.demandProfile = fieldSetFlags()[5] ? this.demandProfile : (edu.berkeley.path.ModelElements.DemandProfile) defaultValue(fields()[5]); + record.network = fieldSetFlags()[2] ? this.network : (edu.berkeley.path.model_elements.Network) defaultValue(fields()[2]); + record.initialDensityProfile = fieldSetFlags()[3] ? this.initialDensityProfile : (edu.berkeley.path.model_elements.DensityProfile) defaultValue(fields()[3]); + record.fdProfile = fieldSetFlags()[4] ? this.fdProfile : (edu.berkeley.path.model_elements.FDProfile) defaultValue(fields()[4]); + record.demandProfile = fieldSetFlags()[5] ? this.demandProfile : (edu.berkeley.path.model_elements.DemandProfile) defaultValue(fields()[5]); return record; } catch (Exception e) { throw new org.apache.avro.AvroRuntimeException(e); diff --git a/src/main/java/edu/berkeley/path/ModelElements/SpeedProfile.java b/src/main/java/edu/berkeley/path/model_elements/SpeedProfile.java similarity index 75% rename from src/main/java/edu/berkeley/path/ModelElements/SpeedProfile.java rename to src/main/java/edu/berkeley/path/model_elements/SpeedProfile.java index adfdfb9..d6dcfcb 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/SpeedProfile.java +++ b/src/main/java/edu/berkeley/path/model_elements/SpeedProfile.java @@ -3,11 +3,11 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") /** Speed on each link and cell at a point in time */ public class SpeedProfile extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"SpeedProfile\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"doc\":\"Speed on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"metersPerSecond\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"SpeedProfile\",\"namespace\":\"edu.berkeley.path.model_elements\",\"doc\":\"Speed on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"metersPerSecond\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]}"); @Deprecated public java.lang.CharSequence id; /** map key is linkId */ @Deprecated public java.util.Map> metersPerSecond; @@ -61,18 +61,18 @@ public void setMetersPerSecond(java.util.Map> ge } /** Sets the value of the 'metersPerSecond' field */ - public edu.berkeley.path.ModelElements.SpeedProfile.Builder setMetersPerSecond(java.util.Map> value) { + public edu.berkeley.path.model_elements.SpeedProfile.Builder setMetersPerSecond(java.util.Map> value) { validate(fields()[1], value); this.metersPerSecond = value; fieldSetFlags()[1] = true; @@ -151,7 +151,7 @@ public boolean hasMetersPerSecond() { } /** Clears the value of the 'metersPerSecond' field */ - public edu.berkeley.path.ModelElements.SpeedProfile.Builder clearMetersPerSecond() { + public edu.berkeley.path.model_elements.SpeedProfile.Builder clearMetersPerSecond() { metersPerSecond = null; fieldSetFlags()[1] = false; return this; diff --git a/src/main/java/edu/berkeley/path/ModelElements/Time.java b/src/main/java/edu/berkeley/path/model_elements/Time.java similarity index 75% rename from src/main/java/edu/berkeley/path/ModelElements/Time.java rename to src/main/java/edu/berkeley/path/model_elements/Time.java index acf04f7..23022c5 100644 --- a/src/main/java/edu/berkeley/path/ModelElements/Time.java +++ b/src/main/java/edu/berkeley/path/model_elements/Time.java @@ -3,12 +3,12 @@ * * DO NOT EDIT DIRECTLY */ -package edu.berkeley.path.ModelElements; +package edu.berkeley.path.model_elements; @SuppressWarnings("all") /** seconds and milliseconds, can be absolute or relative (when absolute: since epoch, utc) */ public class Time extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Time\",\"namespace\":\"edu.berkeley.path.ModelElements\",\"doc\":\"seconds and milliseconds, can be absolute or relative\\n (when absolute: since epoch, utc)\",\"fields\":[{\"name\":\"seconds\",\"type\":\"long\"},{\"name\":\"milliseconds\",\"type\":\"long\"}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Time\",\"namespace\":\"edu.berkeley.path.model_elements\",\"doc\":\"seconds and milliseconds, can be absolute or relative\\n (when absolute: since epoch, utc)\",\"fields\":[{\"name\":\"seconds\",\"type\":\"long\"},{\"name\":\"milliseconds\",\"type\":\"long\"}]}"); @Deprecated public long seconds; @Deprecated public long milliseconds; public org.apache.avro.Schema getSchema() { return SCHEMA$; } @@ -61,18 +61,18 @@ public void setMilliseconds(java.lang.Long value) { } /** Creates a new Time RecordBuilder */ - public static edu.berkeley.path.ModelElements.Time.Builder newBuilder() { - return new edu.berkeley.path.ModelElements.Time.Builder(); + public static edu.berkeley.path.model_elements.Time.Builder newBuilder() { + return new edu.berkeley.path.model_elements.Time.Builder(); } /** Creates a new Time RecordBuilder by copying an existing Builder */ - public static edu.berkeley.path.ModelElements.Time.Builder newBuilder(edu.berkeley.path.ModelElements.Time.Builder other) { - return new edu.berkeley.path.ModelElements.Time.Builder(other); + public static edu.berkeley.path.model_elements.Time.Builder newBuilder(edu.berkeley.path.model_elements.Time.Builder other) { + return new edu.berkeley.path.model_elements.Time.Builder(other); } /** Creates a new Time RecordBuilder by copying an existing Time instance */ - public static edu.berkeley.path.ModelElements.Time.Builder newBuilder(edu.berkeley.path.ModelElements.Time other) { - return new edu.berkeley.path.ModelElements.Time.Builder(other); + public static edu.berkeley.path.model_elements.Time.Builder newBuilder(edu.berkeley.path.model_elements.Time other) { + return new edu.berkeley.path.model_elements.Time.Builder(other); } /** @@ -86,17 +86,17 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild /** Creates a new Builder */ private Builder() { - super(edu.berkeley.path.ModelElements.Time.SCHEMA$); + super(edu.berkeley.path.model_elements.Time.SCHEMA$); } /** Creates a Builder by copying an existing Builder */ - private Builder(edu.berkeley.path.ModelElements.Time.Builder other) { + private Builder(edu.berkeley.path.model_elements.Time.Builder other) { super(other); } /** Creates a Builder by copying an existing Time instance */ - private Builder(edu.berkeley.path.ModelElements.Time other) { - super(edu.berkeley.path.ModelElements.Time.SCHEMA$); + private Builder(edu.berkeley.path.model_elements.Time other) { + super(edu.berkeley.path.model_elements.Time.SCHEMA$); if (isValidValue(fields()[0], other.seconds)) { this.seconds = (java.lang.Long) data().deepCopy(fields()[0].schema(), other.seconds); fieldSetFlags()[0] = true; @@ -113,7 +113,7 @@ public java.lang.Long getSeconds() { } /** Sets the value of the 'seconds' field */ - public edu.berkeley.path.ModelElements.Time.Builder setSeconds(long value) { + public edu.berkeley.path.model_elements.Time.Builder setSeconds(long value) { validate(fields()[0], value); this.seconds = value; fieldSetFlags()[0] = true; @@ -126,7 +126,7 @@ public boolean hasSeconds() { } /** Clears the value of the 'seconds' field */ - public edu.berkeley.path.ModelElements.Time.Builder clearSeconds() { + public edu.berkeley.path.model_elements.Time.Builder clearSeconds() { fieldSetFlags()[0] = false; return this; } @@ -137,7 +137,7 @@ public java.lang.Long getMilliseconds() { } /** Sets the value of the 'milliseconds' field */ - public edu.berkeley.path.ModelElements.Time.Builder setMilliseconds(long value) { + public edu.berkeley.path.model_elements.Time.Builder setMilliseconds(long value) { validate(fields()[1], value); this.milliseconds = value; fieldSetFlags()[1] = true; @@ -150,7 +150,7 @@ public boolean hasMilliseconds() { } /** Clears the value of the 'milliseconds' field */ - public edu.berkeley.path.ModelElements.Time.Builder clearMilliseconds() { + public edu.berkeley.path.model_elements.Time.Builder clearMilliseconds() { fieldSetFlags()[1] = false; return this; } diff --git a/src/main/java/edu/berkeley/path/model_elements/model_elements.java b/src/main/java/edu/berkeley/path/model_elements/model_elements.java new file mode 100644 index 0000000..7840e54 --- /dev/null +++ b/src/main/java/edu/berkeley/path/model_elements/model_elements.java @@ -0,0 +1,22 @@ +/** + * Autogenerated by Avro + * + * DO NOT EDIT DIRECTLY + */ +package edu.berkeley.path.model_elements; + +@SuppressWarnings("all") +/** * Description of the config and state of our networks and related data. + * + * Note: all units in SI (meters, seconds, etc.) except where specified. */ +public interface model_elements { + public static final org.apache.avro.Protocol PROTOCOL = org.apache.avro.Protocol.parse("{\"protocol\":\"model_elements\",\"namespace\":\"edu.berkeley.path.model_elements\",\"doc\":\"* Description of the config and state of our networks and related data.\\n *\\n * Note: all units in SI (meters, seconds, etc.) except where specified.\",\"types\":[{\"type\":\"record\",\"name\":\"Time\",\"doc\":\"seconds and milliseconds, can be absolute or relative\\n (when absolute: since epoch, utc)\",\"fields\":[{\"name\":\"seconds\",\"type\":\"long\"},{\"name\":\"milliseconds\",\"type\":\"long\"}]},{\"type\":\"record\",\"name\":\"NodeRef\",\"fields\":[{\"name\":\"nodeId\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"LinkRef\",\"fields\":[{\"name\":\"linkId\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"NetworkRef\",\"fields\":[{\"name\":\"networkId\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Node\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"}]},{\"type\":\"record\",\"name\":\"Link\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"type\",\"type\":\"string\"},{\"name\":\"laneCount\",\"type\":\"double\"},{\"name\":\"length\",\"type\":\"double\"},{\"name\":\"laneOffset\",\"type\":\"int\",\"default\":0},{\"name\":\"begin\",\"type\":\"NodeRef\"},{\"name\":\"end\",\"type\":\"NodeRef\"}]},{\"type\":\"record\",\"name\":\"Network\",\"fields\":[{\"name\":\"id\",\"type\":\"string\",\"default\":\"1\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"nodes\",\"type\":{\"type\":\"array\",\"items\":\"Node\"},\"default\":[]},{\"name\":\"links\",\"type\":{\"type\":\"array\",\"items\":\"Link\"},\"default\":[]}]},{\"type\":\"record\",\"name\":\"DensityProfile\",\"doc\":\"Density on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"vehiclesPerMeter\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"SpeedProfile\",\"doc\":\"Speed on each link and cell at a point in time\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"metersPerSecond\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"FD\",\"doc\":\"Fundamental diagram on one link at one time\",\"fields\":[{\"name\":\"freeFlowSpeed\",\"type\":\"double\"},{\"name\":\"freeFlowSpeedStdev\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeed\",\"type\":\"double\"},{\"name\":\"congestionWaveSpeedStdev\",\"type\":\"double\"},{\"name\":\"capacity\",\"type\":\"double\"},{\"name\":\"capacityStdev\",\"type\":\"double\"},{\"name\":\"jamDensity\",\"type\":\"double\"},{\"name\":\"capacityDrop\",\"type\":\"double\"}]},{\"type\":\"record\",\"name\":\"FDProfile\",\"doc\":\"Fundamental diagrams on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"fd\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"FD\"}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"DemandProfile\",\"doc\":\"Demands on each link as time series\",\"fields\":[{\"name\":\"dt\",\"type\":\"double\",\"default\":300.0},{\"name\":\"startTime\",\"type\":\"double\",\"default\":0.0},{\"name\":\"origin\",\"type\":\"LinkRef\",\"doc\":\"may not be null\"},{\"name\":\"destination\",\"type\":\"LinkRef\",\"doc\":\"may be null\"},{\"name\":\"demand\",\"type\":{\"type\":\"map\",\"values\":{\"type\":\"array\",\"items\":\"double\"}},\"doc\":\"map key is linkId, array is time series, as per dt and startTime.\",\"default\":{}}]},{\"type\":\"record\",\"name\":\"Scenario\",\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"network\",\"type\":\"Network\"},{\"name\":\"initialDensityProfile\",\"type\":\"DensityProfile\"},{\"name\":\"fdProfile\",\"type\":\"FDProfile\"},{\"name\":\"demandProfile\",\"type\":\"DemandProfile\"}]}],\"messages\":{}}"); + + @SuppressWarnings("all") + /** * Description of the config and state of our networks and related data. + * + * Note: all units in SI (meters, seconds, etc.) except where specified. */ + public interface Callback extends model_elements { + public static final org.apache.avro.Protocol PROTOCOL = edu.berkeley.path.model_elements.model_elements.PROTOCOL; + } +} \ No newline at end of file diff --git a/src/test/java/ModelElements/DensityProfileTest.java b/src/test/java/model_elements/DensityProfileTest.java similarity index 96% rename from src/test/java/ModelElements/DensityProfileTest.java rename to src/test/java/model_elements/DensityProfileTest.java index 3eb2138..e9cf0fb 100644 --- a/src/test/java/ModelElements/DensityProfileTest.java +++ b/src/test/java/model_elements/DensityProfileTest.java @@ -27,14 +27,14 @@ * SUCH DAMAGE. */ -package ModelElements; +package edu.berkeley.path.model_elements; import org.junit.*; import static org.junit.Assert.*; import java.util.*; -import edu.berkeley.path.ModelElements.*; +import edu.berkeley.path.model_elements.*; public class DensityProfileTest { Network nw; diff --git a/src/test/java/ModelElements/NetworkTest.java b/src/test/java/model_elements/NetworkTest.java similarity index 96% rename from src/test/java/ModelElements/NetworkTest.java rename to src/test/java/model_elements/NetworkTest.java index 8133282..c0b759f 100644 --- a/src/test/java/ModelElements/NetworkTest.java +++ b/src/test/java/model_elements/NetworkTest.java @@ -27,14 +27,14 @@ * SUCH DAMAGE. */ -package ModelElements; +package edu.berkeley.path.model_elements; import org.junit.*; import static org.junit.Assert.*; import java.util.*; -import edu.berkeley.path.ModelElements.*; +import edu.berkeley.path.model_elements.*; public class NetworkTest { Network nw; diff --git a/src/test/java/ModelElements/WriterTest.java b/src/test/java/model_elements/WriterTest.java similarity index 98% rename from src/test/java/ModelElements/WriterTest.java rename to src/test/java/model_elements/WriterTest.java index 8f87c02..6274e77 100644 --- a/src/test/java/ModelElements/WriterTest.java +++ b/src/test/java/model_elements/WriterTest.java @@ -27,14 +27,14 @@ * SUCH DAMAGE. */ -package ModelElements; +package edu.berkeley.path.model_elements; import org.junit.*; import static org.junit.Assert.*; import java.util.*; -import edu.berkeley.path.ModelElements.*; +import edu.berkeley.path.model_elements.*; import java.io.File; import java.io.IOException;