Skip to content

Commit b3aa634

Browse files
madhephaestusmadhephaestus
committed
Adding additional position configs
1 parent 48706ee commit b3aa634

File tree

3 files changed

+147
-2
lines changed

3 files changed

+147
-2
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ src/main/java/mujoco/*.h
2020

2121
*.DS_Store*
2222
cppbuild
23-
*hs_err_*.log
23+
*hs_err_*.log
24+
/MUJOCO_LOG.TXT

‎schema‎

‎src/main/java/org/mujoco/xml/actuator/PositionType.java‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
* <complexContent>
3636
* <extension base="{actuator}motorType">
3737
* <attribute name="kp" type="{http://www.w3.org/2001/XMLSchema}decimal" default="1" />
38+
* <attribute name="kv" type="{http://www.w3.org/2001/XMLSchema}decimal" default="1" />
39+
* <attribute name="inheritrange" type="{http://www.w3.org/2001/XMLSchema}decimal" default="1" />
3840
* </extension>
3941
* </complexContent>
4042
* </complexType>
@@ -51,6 +53,10 @@ public class PositionType
5153

5254
@XmlAttribute(name = "kp")
5355
protected BigDecimal kp;
56+
@XmlAttribute(name = "kv")
57+
protected BigDecimal kv;
58+
@XmlAttribute(name = "inheritrange")
59+
protected BigDecimal inheritrange;
5460

5561
/**
5662
* Generated by copy-constructor plugin, JAXB requires public no-arg constructor.
@@ -69,6 +75,8 @@ public PositionType() {
6975
public PositionType(final PositionType _other) {
7076
super(_other);
7177
this.kp = _other.kp;
78+
this.kv = _other.kv;
79+
this.inheritrange = _other.inheritrange;
7280
}
7381

7482
/**
@@ -87,6 +95,14 @@ public PositionType(final PositionType _other, final PropertyTree _propertyTree,
8795
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(kpPropertyTree!= null):((kpPropertyTree == null)||(!kpPropertyTree.isLeaf())))) {
8896
this.kp = _other.kp;
8997
}
98+
final PropertyTree kvPropertyTree = ((_propertyTree == null)?null:_propertyTree.get("kv"));
99+
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(kvPropertyTree!= null):((kvPropertyTree == null)||(!kvPropertyTree.isLeaf())))) {
100+
this.kv = _other.kv;
101+
}
102+
final PropertyTree inheritrangePropertyTree = ((_propertyTree == null)?null:_propertyTree.get("inheritrange"));
103+
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(inheritrangePropertyTree!= null):((inheritrangePropertyTree == null)||(!inheritrangePropertyTree.isLeaf())))) {
104+
this.inheritrange = _other.inheritrange;
105+
}
90106
}
91107

92108
/**
@@ -105,6 +121,38 @@ public BigDecimal getKp() {
105121
}
106122
}
107123

124+
/**
125+
* Gets the value of the kv property.
126+
*
127+
* @return
128+
* possible object is
129+
* {@link BigDecimal }
130+
*
131+
*/
132+
public BigDecimal getKv() {
133+
if (kv == null) {
134+
return new BigDecimal("1");
135+
} else {
136+
return kv;
137+
}
138+
}
139+
140+
/**
141+
* Gets the value of the inheritrange property.
142+
*
143+
* @return
144+
* possible object is
145+
* {@link BigDecimal }
146+
*
147+
*/
148+
public BigDecimal getInheritrange() {
149+
if (inheritrange == null) {
150+
return new BigDecimal("1");
151+
} else {
152+
return inheritrange;
153+
}
154+
}
155+
108156
@Override
109157
public PositionType withVetoableChangeListener(final VetoableChangeListener vetoableChangeListener) {
110158
addVetoableChangeListener(vetoableChangeListener);
@@ -128,6 +176,28 @@ public void setKp(final BigDecimal value) {
128176
this.propertyChange__Support.firePropertyChange("kp", __oldValue, value);
129177
}
130178

179+
public void setKv(final BigDecimal value) {
180+
final BigDecimal __oldValue = this.kv;
181+
try {
182+
this.vetoableChange__Support.fireVetoableChange("kv", __oldValue, value);
183+
} catch (PropertyVetoException x) {
184+
throw new RuntimeException(x);
185+
}
186+
this.kv = value;
187+
this.propertyChange__Support.firePropertyChange("kv", __oldValue, value);
188+
}
189+
190+
public void setInheritrange(final BigDecimal value) {
191+
final BigDecimal __oldValue = this.inheritrange;
192+
try {
193+
this.vetoableChange__Support.fireVetoableChange("inheritrange", __oldValue, value);
194+
} catch (PropertyVetoException x) {
195+
throw new RuntimeException(x);
196+
}
197+
this.inheritrange = value;
198+
this.propertyChange__Support.firePropertyChange("inheritrange", __oldValue, value);
199+
}
200+
131201
@Override
132202
public PositionType clone() {
133203
final PositionType _newObject;
@@ -139,6 +209,8 @@ public PositionType clone() {
139209
public PositionType createCopy() {
140210
final PositionType _newObject = ((PositionType) super.createCopy());
141211
_newObject.kp = this.kp;
212+
_newObject.kv = this.kv;
213+
_newObject.inheritrange = this.inheritrange;
142214
return _newObject;
143215
}
144216

@@ -149,6 +221,14 @@ public PositionType createCopy(final PropertyTree _propertyTree, final PropertyT
149221
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(kpPropertyTree!= null):((kpPropertyTree == null)||(!kpPropertyTree.isLeaf())))) {
150222
_newObject.kp = this.kp;
151223
}
224+
final PropertyTree kvPropertyTree = ((_propertyTree == null)?null:_propertyTree.get("kv"));
225+
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(kvPropertyTree!= null):((kvPropertyTree == null)||(!kvPropertyTree.isLeaf())))) {
226+
_newObject.kv = this.kv;
227+
}
228+
final PropertyTree inheritrangePropertyTree = ((_propertyTree == null)?null:_propertyTree.get("inheritrange"));
229+
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(inheritrangePropertyTree!= null):((inheritrangePropertyTree == null)||(!inheritrangePropertyTree.isLeaf())))) {
230+
_newObject.inheritrange = this.inheritrange;
231+
}
152232
return _newObject;
153233
}
154234

@@ -171,6 +251,8 @@ public PositionType copyOnly(final PropertyTree _propertyTree) {
171251
public<_B >void copyTo(final PositionType.Builder<_B> _other) {
172252
super.copyTo(_other);
173253
_other.kp = this.kp;
254+
_other.kv = this.kv;
255+
_other.inheritrange = this.inheritrange;
174256
}
175257

176258
@Override
@@ -211,6 +293,14 @@ public<_B >void copyTo(final PositionType.Builder<_B> _other, final PropertyTree
211293
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(kpPropertyTree!= null):((kpPropertyTree == null)||(!kpPropertyTree.isLeaf())))) {
212294
_other.kp = this.kp;
213295
}
296+
final PropertyTree kvPropertyTree = ((_propertyTree == null)?null:_propertyTree.get("kv"));
297+
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(kvPropertyTree!= null):((kvPropertyTree == null)||(!kvPropertyTree.isLeaf())))) {
298+
_other.kv = this.kv;
299+
}
300+
final PropertyTree inheritrangePropertyTree = ((_propertyTree == null)?null:_propertyTree.get("inheritrange"));
301+
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(inheritrangePropertyTree!= null):((inheritrangePropertyTree == null)||(!inheritrangePropertyTree.isLeaf())))) {
302+
_other.inheritrange = this.inheritrange;
303+
}
214304
}
215305

216306
@Override
@@ -262,11 +352,15 @@ public static class Builder<_B >
262352
{
263353

264354
private BigDecimal kp;
355+
private BigDecimal kv;
356+
private BigDecimal inheritrange;
265357

266358
public Builder(final _B _parentBuilder, final PositionType _other, final boolean _copy) {
267359
super(_parentBuilder, _other, _copy);
268360
if (_other!= null) {
269361
this.kp = _other.kp;
362+
this.kv = _other.kv;
363+
this.inheritrange = _other.inheritrange;
270364
}
271365
}
272366

@@ -277,11 +371,21 @@ public Builder(final _B _parentBuilder, final PositionType _other, final boolean
277371
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(kpPropertyTree!= null):((kpPropertyTree == null)||(!kpPropertyTree.isLeaf())))) {
278372
this.kp = _other.kp;
279373
}
374+
final PropertyTree kvPropertyTree = ((_propertyTree == null)?null:_propertyTree.get("kv"));
375+
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(kvPropertyTree!= null):((kvPropertyTree == null)||(!kvPropertyTree.isLeaf())))) {
376+
this.kv = _other.kv;
377+
}
378+
final PropertyTree inheritrangePropertyTree = ((_propertyTree == null)?null:_propertyTree.get("inheritrange"));
379+
if (((_propertyTreeUse == PropertyTreeUse.INCLUDE)?(inheritrangePropertyTree!= null):((inheritrangePropertyTree == null)||(!inheritrangePropertyTree.isLeaf())))) {
380+
this.inheritrange = _other.inheritrange;
381+
}
280382
}
281383
}
282384

283385
protected<_P extends PositionType >_P init(final _P _product) {
284386
_product.kp = this.kp;
387+
_product.kv = this.kv;
388+
_product.inheritrange = this.inheritrange;
285389
return super.init(_product);
286390
}
287391

@@ -296,6 +400,28 @@ public PositionType.Builder<_B> withKp(final BigDecimal kp) {
296400
return this;
297401
}
298402

403+
/**
404+
* Sets the new value of "kv" (any previous value will be replaced)
405+
*
406+
* @param kv
407+
* New value of the "kv" property.
408+
*/
409+
public PositionType.Builder<_B> withKv(final BigDecimal kv) {
410+
this.kv = kv;
411+
return this;
412+
}
413+
414+
/**
415+
* Sets the new value of "inheritrange" (any previous value will be replaced)
416+
*
417+
* @param inheritrange
418+
* New value of the "inheritrange" property.
419+
*/
420+
public PositionType.Builder<_B> withInheritrange(final BigDecimal inheritrange) {
421+
this.inheritrange = inheritrange;
422+
return this;
423+
}
424+
299425
/**
300426
* Sets the new value of "name" (any previous value will be replaced)
301427
*
@@ -519,6 +645,8 @@ public PositionType.Builder<_B> copyOf(final PositionType.Builder _other) {
519645
public static class PropInfo {
520646

521647
public final static transient String KP = "kp";
648+
public final static transient String KV = "kv";
649+
public final static transient String INHERITRANGE = "inheritrange";
522650

523651
}
524652

@@ -542,6 +670,8 @@ public static class Selector<TRoot extends com.kscs.util.jaxb.Selector<TRoot, ?>
542670
{
543671

544672
private com.kscs.util.jaxb.Selector<TRoot, PositionType.Selector<TRoot, TParent>> kp = null;
673+
private com.kscs.util.jaxb.Selector<TRoot, PositionType.Selector<TRoot, TParent>> kv = null;
674+
private com.kscs.util.jaxb.Selector<TRoot, PositionType.Selector<TRoot, TParent>> inheritrange = null;
545675

546676
public Selector(final TRoot root, final TParent parent, final String propertyName) {
547677
super(root, parent, propertyName);
@@ -554,13 +684,27 @@ public Map<String, PropertyTree> buildChildren() {
554684
if (this.kp!= null) {
555685
products.put("kp", this.kp.init());
556686
}
687+
if (this.kv!= null) {
688+
products.put("kv", this.kv.init());
689+
}
690+
if (this.inheritrange!= null) {
691+
products.put("inheritrange", this.inheritrange.init());
692+
}
557693
return products;
558694
}
559695

560696
public com.kscs.util.jaxb.Selector<TRoot, PositionType.Selector<TRoot, TParent>> kp() {
561697
return ((this.kp == null)?this.kp = new com.kscs.util.jaxb.Selector<TRoot, PositionType.Selector<TRoot, TParent>>(this._root, this, "kp"):this.kp);
562698
}
563699

700+
public com.kscs.util.jaxb.Selector<TRoot, PositionType.Selector<TRoot, TParent>> kv() {
701+
return ((this.kv == null)?this.kv = new com.kscs.util.jaxb.Selector<TRoot, PositionType.Selector<TRoot, TParent>>(this._root, this, "kv"):this.kv);
702+
}
703+
704+
public com.kscs.util.jaxb.Selector<TRoot, PositionType.Selector<TRoot, TParent>> inheritrange() {
705+
return ((this.inheritrange == null)?this.inheritrange = new com.kscs.util.jaxb.Selector<TRoot, PositionType.Selector<TRoot, TParent>>(this._root, this, "inheritrange"):this.inheritrange);
706+
}
707+
564708
}
565709

566710
}

0 commit comments

Comments
 (0)