diff --git a/src/org/gcube/dataanalysis/ecoengine/interfaces/ComputationalAgent.java b/src/org/gcube/dataanalysis/ecoengine/interfaces/ComputationalAgent.java new file mode 100644 index 0000000..c12de75 --- /dev/null +++ b/src/org/gcube/dataanalysis/ecoengine/interfaces/ComputationalAgent.java @@ -0,0 +1,21 @@ +package org.gcube.dataanalysis.ecoengine.interfaces; + +import java.util.HashMap; + +import org.gcube.dataanalysis.ecoengine.configuration.WEIGHT; +import org.gcube.dataanalysis.ecoengine.utils.VarCouple; + +public interface ComputationalAgent { + + //set the input parameters for this generator + public HashMap getInputParameters(); + + public String getResourceLoad(); + + public String getResources(); + + public float getStatus(); + + //gets the weight of the generator: according to this the generator will be placed in the execution order + public WEIGHT getWeight(); +} diff --git a/src/org/gcube/dataanalysis/ecoengine/interfaces/Generator.java b/src/org/gcube/dataanalysis/ecoengine/interfaces/Generator.java index 44596b8..a4b51e7 100644 --- a/src/org/gcube/dataanalysis/ecoengine/interfaces/Generator.java +++ b/src/org/gcube/dataanalysis/ecoengine/interfaces/Generator.java @@ -1,24 +1,16 @@ package org.gcube.dataanalysis.ecoengine.interfaces; -import java.util.HashMap; - import org.gcube.dataanalysis.ecoengine.configuration.ALG_PROPS; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.configuration.WEIGHT; -import org.gcube.dataanalysis.ecoengine.utils.VarCouple; -public interface Generator { +public interface Generator extends ComputationalAgent{ public ALG_PROPS[] getSupportedAlgorithms(); - //set the input parameters for this generator - public HashMap getInputParameters(); - //gets the weight of the generator: according to this the generator will be placed in the execution order public WEIGHT getWeight(); - public float getStatus(); - public void init(); public void setConfiguration(AlgorithmConfiguration config); @@ -27,10 +19,6 @@ public interface Generator { public void stopProcess(); - public String getResourceLoad(); - - public String getResources(); - public String getLoad(); public void generate() throws Exception; diff --git a/src/org/gcube/dataanalysis/ecoengine/interfaces/Modeler.java b/src/org/gcube/dataanalysis/ecoengine/interfaces/Modeler.java index 804ddf0..075261b 100644 --- a/src/org/gcube/dataanalysis/ecoengine/interfaces/Modeler.java +++ b/src/org/gcube/dataanalysis/ecoengine/interfaces/Modeler.java @@ -1,20 +1,13 @@ package org.gcube.dataanalysis.ecoengine.interfaces; -import java.util.HashMap; - import org.gcube.dataanalysis.ecoengine.configuration.ALG_PROPS; import org.gcube.dataanalysis.ecoengine.configuration.AlgorithmConfiguration; import org.gcube.dataanalysis.ecoengine.configuration.WEIGHT; -import org.gcube.dataanalysis.ecoengine.utils.VarCouple; -public interface Modeler { +public interface Modeler extends ComputationalAgent{ - public ALG_PROPS[] getSupportedModels(); - //set the input parameters for this generator - public HashMap getInputParameters(); - //gets the weight of the generator: according to this the generator will be placed in the execution order public WEIGHT getWeight(); @@ -24,12 +17,6 @@ public interface Modeler { public void model(AlgorithmConfiguration Input); - public String getResourceLoad(); - - public String getResources(); - - public float getStatus(); - public void stop(); //gets the class name of the model