Changeset 107 for java/main/src/main/java/com/framsticks/params/UniqueListAccess.java

Timestamp:

09/23/13 18:54:07 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• add SimultorProviders? hierarchy
• start Framsticks server over SSH
• FJF compatible with Framsticks 4.0rc3
• reading and writing of standard.expt
• a proof-of-concept implementation of StandardExperiment?

CHANGELOG:
Optionally return FreeAccess? from registry.

Add SimulatorRange?.

StandardExperiment? with genotypes circulation.

Automate registration around StandardState?.

More improvements to StandardExperiment?.

Skeleton version of StandardExperiment?.

Test saving of StandardState?.

Standard experiment state is being loaded.

More development towards StandardState? reading.

Work on reading standard experiment state.

Add classes for standard experiment.

Update example standard.expt

Add FreeAccess? and FreeObject?.

Made compatible with version 4.0rc3

Change deserialization policy.

Improve SSH support.

Working running simulator over SSH.

Fix joining bug in Experiment.

Working version of SimulatorRunner?.

Add more SimulatorProviders?.

Working PrimeExperimentTest? with 4.0rc3

Add references to deserialization.

Add OpaqueObject? and it's serialization.

Add deserialization of dictionaries.

Partial implementation of deserialization.

Add more tests for deserialization.

Prepare tests for deserialization.

Add proper result to prime experiment test.

Minor fixes to simulators providers.

Draft version of SimulatorProvider?.

Add SimulatorProvider? interface.

File:

• java/main/src/main/java/com/framsticks/params/UniqueListAccess.java (modified) (2 diffs)

java/main/src/main/java/com/framsticks/params/UniqueListAccess.java

@@ -187 +187 @@
         }
 
+        public int setUidOf(Object value, String uid) {
+                return uidAccess.select(value).set(uidName, uid);
+        }
+
+        protected int uidCounter = 1;
+
+        public String generateNextUid() {
+                return containedTypeName.substring(0, 1).toUpperCase() + Integer.toString(uidCounter++);
+        }
+
+        public String findNextFreeUid() {
+                String uid;
+                do {
+                        uid = generateNextUid();
+                } while (get(uid, Object.class) != null);
+                return uid;
+        }
+
         protected int setByUid(Object object, String uid) {
                 if (uid == null) {
                         uid = getUidOf(object);
                         if (uid == null) {
-                                log.error("failed to set - missing uid");
-                                return 0;
+                                uid = findNextFreeUid();
+                                setUidOf(object, uid);
                         }
                 }
@@ -205 +223 @@
         @Override
         public <T> int set(int i, T value) {
-                if (i != map.size()) {
-                        throw new FramsticksUnsupportedOperationException().msg("setting element in unique list through index is available only for addition");
-                }
-                set(getUidOf(value), value);
-                return 0;
+                if (value != null) {
+                        if (i != map.size()) {
+                                throw new FramsticksUnsupportedOperationException().msg("setting element in unique list through index is available only for addition");
+                        }
+                        set(getUidOf(value), value);
+                        return 0;
+                }
+                if (i >= map.size()) {
+                        throw new FramsticksUnsupportedOperationException().msg("invalid index for removal");
+                }
+                Object current = get(i, Object.class);
+                return setByUid(null, getUidOf(current));
         }
 
         @Override
         public <T> int set(String id, T value) {
+                if (id == null) {
+                        return setByUid(value, null);
+                }
                 Integer i = Numbers.parse(id, Integer.class);
                 if (i != null) {