marf-cvs Mailing List for Modular Audio Recognition Framework
Brought to you by:
mokhov
You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(54) |
Nov
(187) |
Dec
(434) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(139) |
Feb
(148) |
Mar
(13) |
Apr
(41) |
May
(25) |
Jun
(3) |
Jul
(12) |
Aug
(29) |
Sep
(4) |
Oct
|
Nov
|
Dec
(1) |
2004 |
Jan
|
Feb
|
Mar
|
Apr
(29) |
May
(8) |
Jun
(8) |
Jul
|
Aug
(7) |
Sep
|
Oct
|
Nov
(6) |
Dec
|
2005 |
Jan
(1) |
Feb
(33) |
Mar
(64) |
Apr
(69) |
May
(331) |
Jun
(245) |
Jul
(94) |
Aug
(185) |
Sep
(13) |
Oct
(45) |
Nov
(14) |
Dec
(138) |
2006 |
Jan
(208) |
Feb
(118) |
Mar
(56) |
Apr
(8) |
May
(36) |
Jun
(8) |
Jul
(30) |
Aug
(31) |
Sep
(32) |
Oct
(5) |
Nov
(3) |
Dec
(11) |
2007 |
Jan
(51) |
Feb
(49) |
Mar
(80) |
Apr
(235) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(14) |
Sep
(1) |
Oct
(11) |
Nov
(2) |
Dec
(50) |
2008 |
Jan
(27) |
Feb
(94) |
Mar
(1) |
Apr
(34) |
May
(1) |
Jun
(4) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(6) |
Dec
|
2009 |
Jan
|
Feb
(44) |
Mar
(5) |
Apr
|
May
(1) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(115) |
Dec
|
2010 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(6) |
Sep
(5) |
Oct
(1) |
Nov
|
Dec
|
2011 |
Jan
(35) |
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(13) |
Dec
(2) |
2012 |
Jan
(6) |
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
(7) |
Jul
(6) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(6) |
2013 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
|
Mar
(4) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Serguei A. M. <mo...@us...> - 2016-03-31 18:39:35
|
Update of /cvsroot/marf/marf/doc/src/tex In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31371/marf/doc/src/tex Modified Files: Tag: INSE691A report.bib Log Message: Sync bib. Index: report.bib =================================================================== RCS file: /cvsroot/marf/marf/doc/src/tex/report.bib,v retrieving revision 1.18.4.20 retrieving revision 1.18.4.21 diff -C2 -d -r1.18.4.20 -r1.18.4.21 *** report.bib 9 Jan 2013 17:15:05 -0000 1.18.4.20 --- report.bib 31 Mar 2016 18:39:30 -0000 1.18.4.21 *************** *** 2,6 **** %% References %% ! %% Collection of references compiled by Serguei A. Mokhov, mokhov AT cs.concordia.ca, %% from a variety of projects. Requires the `url' package to be included prior use. %% --- 2,6 ---- %% References %% ! %% Collection of references compiled by Serguei A. Mokhov, mokhov AT cse.concordia.ca, %% from a variety of projects. Requires the `url' package to be included prior use. [...19511 lines suppressed...] + author = {M. P. Mulder and A. Nijholt}, + title = {Humour Research: State of the Art}, + year = 2002, + month = sep, + howpublished = {[online]}, + note = {\url{http://doc.utwente.nl/63066/1/0000009e.pdf}} + } + + @misc + { + kudrowitz, + author = {Kudrowitz}, + title = {Haha and aha! : creativity, idea generation, improvisational humor, and product design}, + year = 2010, + month = {}, + howpublished = {[online]}, + note = {\url{http://dspace.mit.edu/handle/1721.1/61610}} + } + % EOF |
From: Serguei A. M. <mo...@us...> - 2015-10-07 02:05:28
|
Update of /cvsroot/marf/apps/SpeakerIdentApp In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24392/SpeakerIdentApp Modified Files: Makefile Log Message: Conservatively bump to 1.6 to re-enable Makefile-based builds with <Enumeration>, etc. Will review later. Index: Makefile =================================================================== RCS file: /cvsroot/marf/apps/SpeakerIdentApp/Makefile,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Makefile 9 Jan 2012 04:03:22 -0000 1.36 --- Makefile 7 Oct 2015 02:05:25 -0000 1.37 *************** *** 28,35 **** JAVAC = javac CLASSPATH = ".:$(MARFJAR)" ! JFLAGS = -g -source 1.4 -verbose -deprecation -classpath $(CLASSPATH) -extdirs ".:$(MARFJAR)" -sourcepath . JVM = java ! JAVADOCFLAGS = -source 1.4 -verbose -use -version -author -classpath ".:$(MARFJAR)" # --- 28,35 ---- JAVAC = javac CLASSPATH = ".:$(MARFJAR)" ! JFLAGS = -g -source 1.5 -verbose -deprecation -classpath $(CLASSPATH) -extdirs ".:$(MARFJAR)" -sourcepath . JVM = java ! JAVADOCFLAGS = -source 1.5 -verbose -use -version -author -classpath ".:$(MARFJAR)" # |
From: Serguei A. M. <mo...@us...> - 2015-04-05 00:20:56
|
Update of /cvsroot/marf/marf/src/marf/Storage In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4106/Storage Modified Files: ISampleLoader.java SampleLoader.java Log Message: Ensure closing of the streams since may cause problems for very long runs with a lot of sample files open hitting OS limits. Index: SampleLoader.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/Storage/SampleLoader.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** SampleLoader.java 22 Feb 2009 02:16:01 -0000 1.30 --- SampleLoader.java 5 Apr 2015 00:20:53 -0000 1.31 *************** *** 206,209 **** --- 206,231 ---- } + /* (non-Javadoc) + * @see marf.Storage.ISampleLoader#close() + */ + @Override + public void close() + throws StorageException + { + try + { + if(this.oByteArrayOutputStream != null) + { + this.oByteArrayOutputStream.close(); + } + } + catch(Exception e) + { + System.err.println(e.getMessage()); + e.printStackTrace(System.err); + throw new StorageException(e); + } + } + /** * <p><code>updateSample()</code> is just used whenever the Index: ISampleLoader.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/Storage/ISampleLoader.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ISampleLoader.java 23 Dec 2007 06:29:46 -0000 1.14 --- ISampleLoader.java 5 Apr 2015 00:20:53 -0000 1.15 *************** *** 159,162 **** --- 159,170 ---- /** + * Closes any associated open streams. + * @throws StorageException if there was an error closing streams + * @since 0.3.0.6, April 2015 + */ + void close() + throws StorageException; + + /** * <p><code>updateSample()</code> is just used whenever the * <code>AudioInputStream</code> is assigned to a new value (wave file). |
From: Serguei A. M. <mo...@us...> - 2015-04-05 00:20:55
|
Update of /cvsroot/marf/marf/src/marf In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4106 Modified Files: MARF.java Log Message: Ensure closing of the streams since may cause problems for very long runs with a lot of sample files open hitting OS limits. Index: MARF.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/MARF.java,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** MARF.java 8 Mar 2015 19:47:22 -0000 1.121 --- MARF.java 5 Apr 2015 00:20:53 -0000 1.122 *************** *** 1423,1426 **** --- 1423,1428 ---- } } + + soSampleLoader.close(); } *************** *** 1440,1443 **** --- 1442,1447 ---- } } + + soSampleLoader.close(); } *************** *** 1472,1475 **** --- 1476,1481 ---- //XXX batch: soClassification.dump(); } + + soSampleLoader.close(); } *************** *** 1494,1497 **** --- 1500,1505 ---- } } + + soSampleLoader.close(); } |
From: Serguei A. M. <mo...@us...> - 2015-03-22 19:32:10
|
Update of /cvsroot/marf/marf/src/marf/Classification In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2684 Modified Files: Classification.java Log Message: Adjust cluster filenames to include frequency component. Index: Classification.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/Classification/Classification.java,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** Classification.java 8 Mar 2015 19:47:21 -0000 1.55 --- Classification.java 22 Mar 2015 19:32:08 -0000 1.56 *************** *** 10,13 **** --- 10,14 ---- import marf.Storage.StorageManager; import marf.Storage.TrainingSet; + import marf.Storage.Loaders.AudioSampleLoader; *************** *** 446,449 **** --- 447,458 ---- } + // To partition saved cluster by their sampling frequency + float fDefaultLoadingFrequency = 0f; + + if(MARF.getSampleLoader() instanceof AudioSampleLoader) + { + fDefaultLoadingFrequency = ((AudioSampleLoader)MARF.getSampleLoader()).getRequiredFrequency(); + } + return new StringBuffer() // Any prefix specified by an application *************** *** 458,461 **** --- 467,471 ---- .append(MARF.getSampleFormat()) .append(MARF.getSampleFormat() == MARF.CUSTOM ? "-".concat(MARF.getSampleLoader().getClass().getName()) : "") + .append(fDefaultLoadingFrequency) .append(".") |
From: Serguei A. M. <mo...@us...> - 2015-03-12 15:30:16
|
Update of /cvsroot/marf/marf/src/marf/FeatureExtraction/MinMaxAmplitudes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10779 Modified Files: MinMaxAmplitudes.java Log Message: Enhance exception reporting for now within the module. Index: MinMaxAmplitudes.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/FeatureExtraction/MinMaxAmplitudes/MinMaxAmplitudes.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** MinMaxAmplitudes.java 18 Dec 2007 03:45:41 -0000 1.15 --- MinMaxAmplitudes.java 12 Mar 2015 15:30:14 -0000 1.16 *************** *** 17,26 **** * <p>TODO: needs improvement to select different amplitudes as we don't want * 20 the same maximums or minimums if others are available.</p> - * - * $Id$ - * * * @author Serguei Mokhov ! * @version $Revision$ * @since 0.3.0.2 */ --- 17,23 ---- * <p>TODO: needs improvement to select different amplitudes as we don't want * 20 the same maximums or minimums if others are available.</p> * * @author Serguei Mokhov ! * @version $Id$ * @since 0.3.0.2 */ *************** *** 110,113 **** --- 107,112 ---- catch(Exception e) { + System.err.println(e.getMessage()); + e.printStackTrace(System.err); throw new FeatureExtractionException(e); } |
From: Serguei A. M. <mo...@us...> - 2015-03-08 19:47:24
|
Update of /cvsroot/marf/marf/src/marf/Classification/Similarity In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30456/marf/Classification/Similarity Modified Files: CosineSimilarityMeasure.java Log Message: Implement configurable options for mean, median, single, and no-clustering based trained data sets. Clean up a bit. Index: CosineSimilarityMeasure.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/Classification/Similarity/CosineSimilarityMeasure.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CosineSimilarityMeasure.java 9 Jul 2012 03:53:32 -0000 1.6 --- CosineSimilarityMeasure.java 8 Mar 2015 19:47:21 -0000 1.7 *************** *** 80,126 **** ITrainingSample oTrainingSample = oTrainingSamples.get(i); ! double[] adMeanVector = oTrainingSample.getMeanVector(); // double[] adMeanVector = oTrainingSample.getMedianVector(); ! ! // Sanity check: stored mean vector must never be null ! if(adMeanVector == null) ! { ! throw new ClassificationException ! ( ! "similarity() - Stored mean vector is null for subject (" + oTrainingSample.getSubjectID() + ! ", preprocessing method: " + this.oTrainingSet.getPreprocessingMethod() + ! ", feature extraction methods: " + this.oTrainingSet.getFeatureExtractionMethod() ! ); ! } ! ! // Sanity check: vectors must be of the same length ! if(adMeanVector.length != adIncomingFeatures.length) ! { ! throw new ClassificationException ! ( ! "similarity() - Mean vector length (" + adMeanVector.length + ! ") is not same as of incoming feature vector (" + adIncomingFeatures.length + ")" ! ); ! } ! ! /* ! * We have a mean vector of the samples for this iCurrentSubjectID ! * Compare using whatever distance classifier it is... ! */ ! double dCurrentSimilarity = similarity(adMeanVector, adIncomingFeatures); ! ! Debug.debug("Similarity for subject " + oTrainingSample.getSubjectID() + " = " + dCurrentSimilarity); ! ! // XXX: What should we do in this (very rare and subtle) case? ! if(dCurrentSimilarity == dMaxSimilarity) ! { ! Debug.debug("This similarity had happened before!"); ! } ! ! if(dCurrentSimilarity > dMaxSimilarity) { ! dMaxSimilarity = dCurrentSimilarity; } ! // Collect for stats // XXX: Move to StatsCollector --- 80,128 ---- ITrainingSample oTrainingSample = oTrainingSamples.get(i); ! //double[] adDataVector = oTrainingSample.getMeanVector(); // double[] adMeanVector = oTrainingSample.getMedianVector(); ! for(double[] adDataVector: oTrainingSample.getDataVectors()) { ! // Sanity check: stored mean vector must never be null ! if(adDataVector == null) ! { ! throw new ClassificationException ! ( ! "similarity() - Stored mean vector is null for subject (" + oTrainingSample.getSubjectID() + ! ", preprocessing method: " + this.oTrainingSet.getPreprocessingMethod() + ! ", feature extraction methods: " + this.oTrainingSet.getFeatureExtractionMethod() ! ); ! } ! ! // Sanity check: vectors must be of the same length ! if(adDataVector.length != adIncomingFeatures.length) ! { ! throw new ClassificationException ! ( ! "similarity() - Mean vector length (" + adDataVector.length + ! ") is not same as of incoming feature vector (" + adIncomingFeatures.length + ")" ! ); ! } ! ! /* ! * We have a mean vector of the samples for this iCurrentSubjectID ! * Compare using whatever distance classifier it is... ! */ ! double dCurrentSimilarity = similarity(adDataVector, adIncomingFeatures); ! ! Debug.debug("Similarity for subject " + oTrainingSample.getSubjectID() + " = " + dCurrentSimilarity); ! ! // XXX: What should we do in this (very rare and subtle) case? ! if(dCurrentSimilarity == dMaxSimilarity) ! { ! Debug.debug("This similarity had happened before!"); ! } ! ! if(dCurrentSimilarity > dMaxSimilarity) ! { ! dMaxSimilarity = dCurrentSimilarity; ! } } ! // Collect for stats // XXX: Move to StatsCollector *************** *** 128,132 **** ( oTrainingSample.getSubjectID(), ! dCurrentSimilarity ); } --- 130,134 ---- ( oTrainingSample.getSubjectID(), ! dMaxSimilarity ); } |
From: Serguei A. M. <mo...@us...> - 2015-03-08 19:47:23
|
Update of /cvsroot/marf/marf/src/marf/Classification In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30456/marf/Classification Modified Files: Classification.java Log Message: Implement configurable options for mean, median, single, and no-clustering based trained data sets. Clean up a bit. Index: Classification.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/Classification/Classification.java,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** Classification.java 18 Jul 2012 16:00:20 -0000 1.54 --- Classification.java 8 Mar 2015 19:47:21 -0000 1.55 *************** *** 465,472 **** .append(iSilenceRemoved).append(".") ! // Global cluster: <PR>.<FE>.<FVS> ! // For the same FE method we may have different feature vector sizes .append(MARF.getPreprocessingMethod()).append(".") .append(MARF.getFeatureExtractionMethod()).append(".") .append(iFeaturesCount).append(".") --- 465,474 ---- .append(iSilenceRemoved).append(".") ! // Global cluster: <PR>.<FE>.<FVCLTYPE>.<FVS> ! // For the same FE method we may have different feature vector sizes or ! // how they are clustered. .append(MARF.getPreprocessingMethod()).append(".") .append(MARF.getFeatureExtractionMethod()).append(".") + .append(MARF.getConfiguration().getClusterFormat()).append(".") .append(iFeaturesCount).append(".") |
From: Serguei A. M. <mo...@us...> - 2014-07-23 04:21:31
|
Update of /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/dmarf/events In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15036/dmarf/events Modified Files: Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION LOWPERFORMANCEDETECTED.java PERFORMANCENORMALIZED.java PERFORMANCENORMFAILED.java Log Message: Eliminate leftover package-related compile errors. Index: PERFORMANCENORMFAILED.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/dmarf/events/Attic/PERFORMANCENORMFAILED.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** PERFORMANCENORMFAILED.java 23 Jul 2014 03:51:25 -0000 1.1.2.3 --- PERFORMANCENORMFAILED.java 23 Jul 2014 04:21:29 -0000 1.1.2.4 *************** *** 1,79 **** ! package marf.net.assl.generatedbyassl.as.dmarf.events; ! ! import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.ASSLEVENT; ! ! /** ! * Generated by ASSL Framework ! * ! * This is the Java class generated for 'performanceNormFailed' (specified as EVENT ASSL tier). ! */ ! public class PERFORMANCENORMFAILED ! extends ASSLEVENT ! implements Serializable ! { ! ! /** ! * Generated by ASSL Framework ! * ! * This is a reference to the unique instance of 'PERFORMANCENORMFAILED' class. ! */ ! static private PERFORMANCENORMFAILED oInstance = null; ! /** ! * Generated by ASSL Framework ! * ! * Needed by the class because it implements the Serializable interface. ! */ ! static final long serialVersionUID = 0001L; ! ! /** ! * Generated by ASSL Framework ! * ! * Because this is a singleton class its constructor is private. ! */ ! private PERFORMANCENORMFAILED ( ) ! { ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method returns the unique instance of 'PERFORMANCENORMFAILED' class. ! */ ! static public PERFORMANCENORMFAILED getInstance ( ) ! { ! if ( null == oInstance ) ! { ! oInstance = new PERFORMANCENORMFAILED(); ! } ! return oInstance; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * Initialises the event after the system has been started. ! */ ! public synchronized void postStartInit ( ) ! { ! generatedbyassl.as.aes.stage_ae.events.SELFHEALINGFAILED.getInstance().addEventCatcher(this); ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method checks the event's prompting conditions and if satisfied triggers the event. ! */ ! protected void checkEventConditions ( ) ! { ! //**** triggers the event if the event conditions are satisfied ! if ( isEventOccurred(generatedbyassl.as.aes.stage_ae.events.SELFHEALINGFAILED.getInstance()) ) ! { ! triggerEvent(); ! } ! vOccurredEvents.clear(); ! vReceivedMessages.clear(); ! vSentMessages.clear(); ! } ! } \ No newline at end of file --- 1,79 ---- ! package marf.net.assl.generatedbyassl.as.dmarf.events; ! ! import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.ASSLEVENT; ! ! /** ! * Generated by ASSL Framework ! * ! * This is the Java class generated for 'performanceNormFailed' (specified as EVENT ASSL tier). ! */ ! public class PERFORMANCENORMFAILED ! extends ASSLEVENT ! implements Serializable ! { ! ! /** ! * Generated by ASSL Framework ! * ! * This is a reference to the unique instance of 'PERFORMANCENORMFAILED' class. ! */ ! static private PERFORMANCENORMFAILED oInstance = null; ! /** ! * Generated by ASSL Framework ! * ! * Needed by the class because it implements the Serializable interface. ! */ ! static final long serialVersionUID = 0001L; ! ! /** ! * Generated by ASSL Framework ! * ! * Because this is a singleton class its constructor is private. ! */ ! private PERFORMANCENORMFAILED ( ) ! { ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method returns the unique instance of 'PERFORMANCENORMFAILED' class. ! */ ! static public PERFORMANCENORMFAILED getInstance ( ) ! { ! if ( null == oInstance ) ! { ! oInstance = new PERFORMANCENORMFAILED(); ! } ! return oInstance; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * Initialises the event after the system has been started. ! */ ! public synchronized void postStartInit ( ) ! { ! marf.net.assl.generatedbyassl.as.aes.stage_ae.events.SELFHEALINGFAILED.getInstance().addEventCatcher(this); ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method checks the event's prompting conditions and if satisfied triggers the event. ! */ ! protected void checkEventConditions ( ) ! { ! //**** triggers the event if the event conditions are satisfied ! if ( isEventOccurred(marf.net.assl.generatedbyassl.as.aes.stage_ae.events.SELFHEALINGFAILED.getInstance()) ) ! { ! triggerEvent(); ! } ! vOccurredEvents.clear(); ! vReceivedMessages.clear(); ! vSentMessages.clear(); ! } ! } \ No newline at end of file Index: LOWPERFORMANCEDETECTED.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/dmarf/events/Attic/LOWPERFORMANCEDETECTED.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** LOWPERFORMANCEDETECTED.java 23 Jul 2014 03:51:25 -0000 1.1.2.3 --- LOWPERFORMANCEDETECTED.java 23 Jul 2014 04:21:29 -0000 1.1.2.4 *************** *** 1,81 **** ! package marf.net.assl.generatedbyassl.as.dmarf.events; ! ! import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.ASSLEVENT; ! ! /** ! * Generated by ASSL Framework ! * ! * This is the Java class generated for 'lowPerformanceDetected' (specified as EVENT ASSL tier). ! */ ! public class LOWPERFORMANCEDETECTED ! extends ASSLEVENT ! implements Serializable ! { ! ! /** ! * Generated by ASSL Framework ! * ! * This is a reference to the unique instance of 'LOWPERFORMANCEDETECTED' class. ! */ ! static private LOWPERFORMANCEDETECTED oInstance = null; ! /** ! * Generated by ASSL Framework ! * ! * Needed by the class because it implements the Serializable interface. ! */ ! static final long serialVersionUID = 0001L; ! ! /** ! * Generated by ASSL Framework ! * ! * Because this is a singleton class its constructor is private. ! */ ! private LOWPERFORMANCEDETECTED ( ) ! { ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method returns the unique instance of 'LOWPERFORMANCEDETECTED' class. ! */ ! static public LOWPERFORMANCEDETECTED getInstance ( ) ! { ! if ( null == oInstance ) ! { ! oInstance = new LOWPERFORMANCEDETECTED(); ! } ! return oInstance; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * Initialises the event after the system has been started. ! */ ! public synchronized void postStartInit ( ) ! { ! vSLO.add( generatedbyassl.as.dmarf.asslo.PERFORMANCE.getInstance() ); ! vPreviousSLOState.add( vSLO.elementAt(0 ).isSatisfied() ) ; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method checks the event's prompting conditions and if satisfied triggers the event. ! */ ! protected void checkEventConditions ( ) ! { ! //**** triggers the event if the event conditions are satisfied ! if ( ( isSLOChangedState(0) && ! !vSLO.elementAt(0 ).isSatisfied() ) ) ! { ! triggerEvent(); ! } ! vOccurredEvents.clear(); ! vReceivedMessages.clear(); ! vSentMessages.clear(); ! } ! } \ No newline at end of file --- 1,81 ---- ! package marf.net.assl.generatedbyassl.as.dmarf.events; ! ! import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.ASSLEVENT; ! ! /** ! * Generated by ASSL Framework ! * ! * This is the Java class generated for 'lowPerformanceDetected' (specified as EVENT ASSL tier). ! */ ! public class LOWPERFORMANCEDETECTED ! extends ASSLEVENT ! implements Serializable ! { ! ! /** ! * Generated by ASSL Framework ! * ! * This is a reference to the unique instance of 'LOWPERFORMANCEDETECTED' class. ! */ ! static private LOWPERFORMANCEDETECTED oInstance = null; ! /** ! * Generated by ASSL Framework ! * ! * Needed by the class because it implements the Serializable interface. ! */ ! static final long serialVersionUID = 0001L; ! ! /** ! * Generated by ASSL Framework ! * ! * Because this is a singleton class its constructor is private. ! */ ! private LOWPERFORMANCEDETECTED ( ) ! { ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method returns the unique instance of 'LOWPERFORMANCEDETECTED' class. ! */ ! static public LOWPERFORMANCEDETECTED getInstance ( ) ! { ! if ( null == oInstance ) ! { ! oInstance = new LOWPERFORMANCEDETECTED(); ! } ! return oInstance; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * Initialises the event after the system has been started. ! */ ! public synchronized void postStartInit ( ) ! { ! vSLO.add( marf.net.assl.generatedbyassl.as.dmarf.asslo.PERFORMANCE.getInstance() ); ! vPreviousSLOState.add( vSLO.elementAt(0 ).isSatisfied() ) ; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method checks the event's prompting conditions and if satisfied triggers the event. ! */ ! protected void checkEventConditions ( ) ! { ! //**** triggers the event if the event conditions are satisfied ! if ( ( isSLOChangedState(0) && ! !vSLO.elementAt(0 ).isSatisfied() ) ) ! { ! triggerEvent(); ! } ! vOccurredEvents.clear(); ! vReceivedMessages.clear(); ! vSentMessages.clear(); ! } ! } \ No newline at end of file Index: PERFORMANCENORMALIZED.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/dmarf/events/Attic/PERFORMANCENORMALIZED.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** PERFORMANCENORMALIZED.java 23 Jul 2014 03:51:25 -0000 1.1.2.3 --- PERFORMANCENORMALIZED.java 23 Jul 2014 04:21:29 -0000 1.1.2.4 *************** *** 1,81 **** ! package marf.net.assl.generatedbyassl.as.dmarf.events; ! ! import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.ASSLEVENT; ! ! /** ! * Generated by ASSL Framework ! * ! * This is the Java class generated for 'performanceNormalized' (specified as EVENT ASSL tier). ! */ ! public class PERFORMANCENORMALIZED ! extends ASSLEVENT ! implements Serializable ! { ! ! /** ! * Generated by ASSL Framework ! * ! * This is a reference to the unique instance of 'PERFORMANCENORMALIZED' class. ! */ ! static private PERFORMANCENORMALIZED oInstance = null; ! /** ! * Generated by ASSL Framework ! * ! * Needed by the class because it implements the Serializable interface. ! */ ! static final long serialVersionUID = 0001L; ! ! /** ! * Generated by ASSL Framework ! * ! * Because this is a singleton class its constructor is private. ! */ ! private PERFORMANCENORMALIZED ( ) ! { ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method returns the unique instance of 'PERFORMANCENORMALIZED' class. ! */ ! static public PERFORMANCENORMALIZED getInstance ( ) ! { ! if ( null == oInstance ) ! { ! oInstance = new PERFORMANCENORMALIZED(); ! } ! return oInstance; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * Initialises the event after the system has been started. ! */ ! public synchronized void postStartInit ( ) ! { ! vSLO.add( generatedbyassl.as.dmarf.asslo.PERFORMANCE.getInstance() ); ! vPreviousSLOState.add( vSLO.elementAt(0 ).isSatisfied() ) ; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method checks the event's prompting conditions and if satisfied triggers the event. ! */ ! protected void checkEventConditions ( ) ! { ! //**** triggers the event if the event conditions are satisfied ! if ( ( isSLOChangedState(0) && ! vSLO.elementAt(0 ).isSatisfied() ) ) ! { ! triggerEvent(); ! } ! vOccurredEvents.clear(); ! vReceivedMessages.clear(); ! vSentMessages.clear(); ! } ! } \ No newline at end of file --- 1,81 ---- ! package marf.net.assl.generatedbyassl.as.dmarf.events; ! ! import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.ASSLEVENT; ! ! /** ! * Generated by ASSL Framework ! * ! * This is the Java class generated for 'performanceNormalized' (specified as EVENT ASSL tier). ! */ ! public class PERFORMANCENORMALIZED ! extends ASSLEVENT ! implements Serializable ! { ! ! /** ! * Generated by ASSL Framework ! * ! * This is a reference to the unique instance of 'PERFORMANCENORMALIZED' class. ! */ ! static private PERFORMANCENORMALIZED oInstance = null; ! /** ! * Generated by ASSL Framework ! * ! * Needed by the class because it implements the Serializable interface. ! */ ! static final long serialVersionUID = 0001L; ! ! /** ! * Generated by ASSL Framework ! * ! * Because this is a singleton class its constructor is private. ! */ ! private PERFORMANCENORMALIZED ( ) ! { ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method returns the unique instance of 'PERFORMANCENORMALIZED' class. ! */ ! static public PERFORMANCENORMALIZED getInstance ( ) ! { ! if ( null == oInstance ) ! { ! oInstance = new PERFORMANCENORMALIZED(); ! } ! return oInstance; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * Initialises the event after the system has been started. ! */ ! public synchronized void postStartInit ( ) ! { ! vSLO.add( marf.net.assl.generatedbyassl.as.dmarf.asslo.PERFORMANCE.getInstance() ); ! vPreviousSLOState.add( vSLO.elementAt(0 ).isSatisfied() ) ; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method checks the event's prompting conditions and if satisfied triggers the event. ! */ ! protected void checkEventConditions ( ) ! { ! //**** triggers the event if the event conditions are satisfied ! if ( ( isSLOChangedState(0) && ! vSLO.elementAt(0 ).isSatisfied() ) ) ! { ! triggerEvent(); ! } ! vOccurredEvents.clear(); ! vReceivedMessages.clear(); ! vSentMessages.clear(); ! } ! } \ No newline at end of file |
From: Serguei A. M. <mo...@us...> - 2014-07-23 04:21:30
|
Update of /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/aes In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15036/aes Modified Files: Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION STAGE_AE.java Log Message: Eliminate leftover package-related compile errors. Index: STAGE_AE.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/aes/Attic/STAGE_AE.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** STAGE_AE.java 23 Jul 2014 03:51:21 -0000 1.1.2.3 --- STAGE_AE.java 23 Jul 2014 04:21:27 -0000 1.1.2.4 *************** *** 1,150 **** ! package marf.net.assl.generatedbyassl.as.aes; ! ! import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.ASSLAE; ! import marf.net.assl.generatedbyassl.as.dmarf.DMARFNODE; ! import marf.net.assl.generatedbyassl.as.aes.stage_ae.controlloop.*; ! ! /** ! * Generated by ASSL Framework ! * ! * This is the Java class generated for 'STAGE_AE' (specified as AE ASSL tier). ! */ ! public class STAGE_AE ! extends ASSLAE ! implements Serializable ! { ! ! /** ! * Generated by ASSL Framework ! * ! * This is a reference to the unique instance of 'STAGE_AE' class. ! */ ! static private STAGE_AE oInstance = null; ! /** ! * Generated by ASSL Framework ! * ! * Needed by the class because it implements the Serializable interface. ! */ ! static final long serialVersionUID = 0001L; ! /** ! * Generated by ASSL Framework ! * ! * Holds a variable/collection specified in the ASSL specification. ! */ ! public DMARFNODE NODETORECOVER = new DMARFNODE(); ! /** ! * Generated by ASSL Framework ! * ! * Holds a reference to the AE control loop's monitor. ! */ ! private STAGE_AE_ASSLMONITOR oMonitor = new STAGE_AE_ASSLMONITOR(); ! /** ! * Generated by ASSL Framework ! * ! * Holds a reference to the AE control loop's analyzer. ! */ ! private STAGE_AE_ASSLANALYZER oAnalyzer = new STAGE_AE_ASSLANALYZER(); ! /** ! * Generated by ASSL Framework ! * ! * Holds a reference to the AE control loop's simulator. ! */ ! private STAGE_AE_ASSLSIMULATOR oSimulator = new STAGE_AE_ASSLSIMULATOR(); ! /** ! * Generated by ASSL Framework ! * ! * Holds a reference to the AE control loop's executor. ! */ ! private STAGE_AE_ASSLEXECUTOR oExecutor = new STAGE_AE_ASSLEXECUTOR(); ! /** ! * Generated by ASSL Framework ! * ! * Holds a reference to the AEIP class. ! */ ! public generatedbyassl.as.aes.stage_ae.AEIP AEIP = generatedbyassl.as.aes.stage_ae.AEIP.getInstance(); ! ! /** ! * Generated by ASSL Framework ! * ! * Because this is a singleton class its constructor is private. ! */ ! private STAGE_AE ( ) ! { ! AESLO.put( "PERFORMANCE", generatedbyassl.as.aes.stage_ae.aeslo.PERFORMANCE.getInstance() ); ! vPolicies.put( "SELF_HEALING", generatedbyassl.as.aes.stage_ae.aeself_management.SELF_HEALING.getInstance() ); ! ACTIONS.put( "ANALYZEPROBLEM", generatedbyassl.as.aes.stage_ae.actions.ANALYZEPROBLEM.getInstance() ); ! ACTIONS.put( "STARTREPLICANODE", generatedbyassl.as.aes.stage_ae.actions.STARTREPLICANODE.getInstance() ); ! ACTIONS.put( "FIXPROBLEMATICNODE", generatedbyassl.as.aes.stage_ae.actions.FIXPROBLEMATICNODE.getInstance() ); ! EVENTS.put( "MUSTDOSELFHEALING", generatedbyassl.as.aes.stage_ae.events.MUSTDOSELFHEALING.getInstance() ); ! EVENTS.put( "SELFHEALINGSUCCESSFUL", generatedbyassl.as.aes.stage_ae.events.SELFHEALINGSUCCESSFUL.getInstance() ); ! EVENTS.put( "SELFHEALINGFAILED", generatedbyassl.as.aes.stage_ae.events.SELFHEALINGFAILED.getInstance() ); ! EVENTS.put( "MUSTSWITCHTONODEREPLICA", generatedbyassl.as.aes.stage_ae.events.MUSTSWITCHTONODEREPLICA.getInstance() ); ! EVENTS.put( "NODEREPLICASTARTED", generatedbyassl.as.aes.stage_ae.events.NODEREPLICASTARTED.getInstance() ); ! EVENTS.put( "NODEREPLICAFAILED", generatedbyassl.as.aes.stage_ae.events.NODEREPLICAFAILED.getInstance() ); ! EVENTS.put( "MUSTFIXNODE", generatedbyassl.as.aes.stage_ae.events.MUSTFIXNODE.getInstance() ); ! EVENTS.put( "NODEFIXED", generatedbyassl.as.aes.stage_ae.events.NODEFIXED.getInstance() ); ! EVENTS.put( "NODECANNOTBEFIXED", generatedbyassl.as.aes.stage_ae.events.NODECANNOTBEFIXED.getInstance() ); ! METRICS.put( "NUMBEROFFAILEDNODES", generatedbyassl.as.aes.stage_ae.metrics.NUMBEROFFAILEDNODES.getInstance() ); ! METRICS.put( "NUMBEROFPROBLEMATICNODES", generatedbyassl.as.aes.stage_ae.metrics.NUMBEROFPROBLEMATICNODES.getInstance() ); ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method returns the unique instance of 'STAGE_AE' class. ! */ ! static public STAGE_AE getInstance ( ) ! { ! if ( null == oInstance ) ! { ! oInstance = new STAGE_AE(); ! } ! return oInstance; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * Sets the control loop components. ! */ ! protected void setControlLoop ( ) ! { ! //**** This method overrides the super class's method. ! //**************************************************** ! oMonitor.setMonitoredSLO(AESLO); ! oMonitor.setMonitoredMetrics(METRICS); ! oMonitor.setAnalyzer(oAnalyzer); ! oAnalyzer.setSimulator(oSimulator); ! oAnalyzer.setExecutor(oExecutor); ! oSimulator.setExecutor(oExecutor); ! } ! ! /** ! * Generated by ASSL Framework ! * ! * Performs the AE control loop. ! */ ! protected void controlLoop ( ) ! { ! //**** This method overrides the super class's method. ! //**************************************************** ! try ! { ! //**** control loops should not be very resource-consuming, thus it releases CPU for a while ! Thread.sleep(1000); ! } ! catch ( InterruptedException ex ) ! { ! System.err.println( ex.getMessage() ); ! } ! //**** performs AE control loop monitor-analyzer-simulator-executor ! oMonitor.perform(); ! oAnalyzer.perform(); ! oSimulator.perform(); ! oExecutor.perform(); ! //**** applies all the "switched-on" self-management policies for the AS ! applayPolicies(); ! } ! } \ No newline at end of file --- 1,150 ---- ! package marf.net.assl.generatedbyassl.as.aes; ! ! import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.ASSLAE; ! import marf.net.assl.generatedbyassl.as.dmarf.DMARFNODE; ! import marf.net.assl.generatedbyassl.as.aes.stage_ae.controlloop.*; ! ! /** ! * Generated by ASSL Framework ! * ! * This is the Java class generated for 'STAGE_AE' (specified as AE ASSL tier). ! */ ! public class STAGE_AE ! extends ASSLAE ! implements Serializable ! { ! ! /** ! * Generated by ASSL Framework ! * ! * This is a reference to the unique instance of 'STAGE_AE' class. ! */ ! static private STAGE_AE oInstance = null; ! /** ! * Generated by ASSL Framework ! * ! * Needed by the class because it implements the Serializable interface. ! */ ! static final long serialVersionUID = 0001L; ! /** ! * Generated by ASSL Framework ! * ! * Holds a variable/collection specified in the ASSL specification. ! */ ! public DMARFNODE NODETORECOVER = new DMARFNODE(); ! /** ! * Generated by ASSL Framework ! * ! * Holds a reference to the AE control loop's monitor. ! */ ! private STAGE_AE_ASSLMONITOR oMonitor = new STAGE_AE_ASSLMONITOR(); ! /** ! * Generated by ASSL Framework ! * ! * Holds a reference to the AE control loop's analyzer. ! */ ! private STAGE_AE_ASSLANALYZER oAnalyzer = new STAGE_AE_ASSLANALYZER(); ! /** ! * Generated by ASSL Framework ! * ! * Holds a reference to the AE control loop's simulator. ! */ ! private STAGE_AE_ASSLSIMULATOR oSimulator = new STAGE_AE_ASSLSIMULATOR(); ! /** ! * Generated by ASSL Framework ! * ! * Holds a reference to the AE control loop's executor. ! */ ! private STAGE_AE_ASSLEXECUTOR oExecutor = new STAGE_AE_ASSLEXECUTOR(); ! /** ! * Generated by ASSL Framework ! * ! * Holds a reference to the AEIP class. ! */ ! public marf.net.assl.generatedbyassl.as.aes.stage_ae.AEIP AEIP = marf.net.assl.generatedbyassl.as.aes.stage_ae.AEIP.getInstance(); ! ! /** ! * Generated by ASSL Framework ! * ! * Because this is a singleton class its constructor is private. ! */ ! private STAGE_AE ( ) ! { ! AESLO.put( "PERFORMANCE", marf.net.assl.generatedbyassl.as.aes.stage_ae.aeslo.PERFORMANCE.getInstance() ); ! vPolicies.put( "SELF_HEALING", marf.net.assl.generatedbyassl.as.aes.stage_ae.aeself_management.SELF_HEALING.getInstance() ); ! ACTIONS.put( "ANALYZEPROBLEM", marf.net.assl.generatedbyassl.as.aes.stage_ae.actions.ANALYZEPROBLEM.getInstance() ); ! ACTIONS.put( "STARTREPLICANODE", marf.net.assl.generatedbyassl.as.aes.stage_ae.actions.STARTREPLICANODE.getInstance() ); ! ACTIONS.put( "FIXPROBLEMATICNODE", marf.net.assl.generatedbyassl.as.aes.stage_ae.actions.FIXPROBLEMATICNODE.getInstance() ); ! EVENTS.put( "MUSTDOSELFHEALING", marf.net.assl.generatedbyassl.as.aes.stage_ae.events.MUSTDOSELFHEALING.getInstance() ); ! EVENTS.put( "SELFHEALINGSUCCESSFUL", marf.net.assl.generatedbyassl.as.aes.stage_ae.events.SELFHEALINGSUCCESSFUL.getInstance() ); ! EVENTS.put( "SELFHEALINGFAILED", marf.net.assl.generatedbyassl.as.aes.stage_ae.events.SELFHEALINGFAILED.getInstance() ); ! EVENTS.put( "MUSTSWITCHTONODEREPLICA", marf.net.assl.generatedbyassl.as.aes.stage_ae.events.MUSTSWITCHTONODEREPLICA.getInstance() ); ! EVENTS.put( "NODEREPLICASTARTED", marf.net.assl.generatedbyassl.as.aes.stage_ae.events.NODEREPLICASTARTED.getInstance() ); ! EVENTS.put( "NODEREPLICAFAILED", marf.net.assl.generatedbyassl.as.aes.stage_ae.events.NODEREPLICAFAILED.getInstance() ); ! EVENTS.put( "MUSTFIXNODE", marf.net.assl.generatedbyassl.as.aes.stage_ae.events.MUSTFIXNODE.getInstance() ); ! EVENTS.put( "NODEFIXED", marf.net.assl.generatedbyassl.as.aes.stage_ae.events.NODEFIXED.getInstance() ); ! EVENTS.put( "NODECANNOTBEFIXED", marf.net.assl.generatedbyassl.as.aes.stage_ae.events.NODECANNOTBEFIXED.getInstance() ); ! METRICS.put( "NUMBEROFFAILEDNODES", marf.net.assl.generatedbyassl.as.aes.stage_ae.metrics.NUMBEROFFAILEDNODES.getInstance() ); ! METRICS.put( "NUMBEROFPROBLEMATICNODES", marf.net.assl.generatedbyassl.as.aes.stage_ae.metrics.NUMBEROFPROBLEMATICNODES.getInstance() ); ! } ! ! /** ! * Generated by ASSL Framework ! * ! * This method returns the unique instance of 'STAGE_AE' class. ! */ ! static public STAGE_AE getInstance ( ) ! { ! if ( null == oInstance ) ! { ! oInstance = new STAGE_AE(); ! } ! return oInstance; ! } ! ! /** ! * Generated by ASSL Framework ! * ! * Sets the control loop components. ! */ ! protected void setControlLoop ( ) ! { ! //**** This method overrides the super class's method. ! //**************************************************** ! oMonitor.setMonitoredSLO(AESLO); ! oMonitor.setMonitoredMetrics(METRICS); ! oMonitor.setAnalyzer(oAnalyzer); ! oAnalyzer.setSimulator(oSimulator); ! oAnalyzer.setExecutor(oExecutor); ! oSimulator.setExecutor(oExecutor); ! } ! ! /** ! * Generated by ASSL Framework ! * ! * Performs the AE control loop. ! */ ! protected void controlLoop ( ) ! { ! //**** This method overrides the super class's method. ! //**************************************************** ! try ! { ! //**** control loops should not be very resource-consuming, thus it releases CPU for a while ! Thread.sleep(1000); ! } ! catch ( InterruptedException ex ) ! { ! System.err.println( ex.getMessage() ); ! } ! //**** performs AE control loop monitor-analyzer-simulator-executor ! oMonitor.perform(); ! oAnalyzer.perform(); ! oSimulator.perform(); ! oExecutor.perform(); ! //**** applies all the "switched-on" self-management policies for the AS ! applayPolicies(); ! } ! } \ No newline at end of file |
From: Serguei A. M. <mo...@us...> - 2014-07-23 03:51:55
|
Update of /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/aes/stage_ae/aeself_management In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12283/marf/net/assl/generatedbyassl/as/aes/stage_ae/aeself_management Modified Files: Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION SELF_HEALING.java Log Message: Fix bad imports. Index: SELF_HEALING.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/aes/stage_ae/aeself_management/Attic/SELF_HEALING.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** SELF_HEALING.java 30 Nov 2009 05:35:05 -0000 1.1.2.2 --- SELF_HEALING.java 23 Jul 2014 03:51:23 -0000 1.1.2.3 *************** *** 2,6 **** import java.io.Serializable; ! import generatedbyassl.as.ASSLPOLICY; /** --- 2,6 ---- import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.ASSLPOLICY; /** |
From: Serguei A. M. <mo...@us...> - 2014-07-23 03:51:54
|
Update of /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/aes/stage_ae In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12283/marf/net/assl/generatedbyassl/as/aes/stage_ae Modified Files: Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION AEIP.java Log Message: Fix bad imports. Index: AEIP.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/aes/stage_ae/Attic/AEIP.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** AEIP.java 30 Nov 2009 05:35:05 -0000 1.1.2.2 --- AEIP.java 23 Jul 2014 03:51:21 -0000 1.1.2.3 *************** *** 3,10 **** import java.io.Serializable; import java.util.Hashtable; ! import generatedbyassl.as.ASSLMESSAGE; ! import generatedbyassl.as.ASSLCHANNEL; ! import generatedbyassl.as.ASSLFUNCTION; ! import generatedbyassl.as.ASSLMANAGED_ELEMENT; /** --- 3,10 ---- import java.io.Serializable; import java.util.Hashtable; ! import marf.net.assl.generatedbyassl.as.ASSLMESSAGE; ! import marf.net.assl.generatedbyassl.as.ASSLCHANNEL; ! import marf.net.assl.generatedbyassl.as.ASSLFUNCTION; ! import marf.net.assl.generatedbyassl.as.ASSLMANAGED_ELEMENT; /** |
From: Serguei A. M. <mo...@us...> - 2014-07-23 03:51:53
|
Update of /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12283/marf/net/assl/generatedbyassl/as Modified Files: Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION DMARF.java Log Message: Fix bad imports. Index: DMARF.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/Attic/DMARF.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** DMARF.java 30 Nov 2009 05:35:05 -0000 1.1.2.2 --- DMARF.java 23 Jul 2014 03:51:21 -0000 1.1.2.3 *************** *** 7,11 **** import java.util.Locale; import java.util.Calendar; ! import generatedbyassl.as.dmarf.controlloop.*; /** --- 7,11 ---- import java.util.Locale; import java.util.Calendar; ! import marf.net.assl.generatedbyassl.as.dmarf.controlloop.*; /** |
From: Serguei A. M. <mo...@us...> - 2014-07-23 03:51:27
|
Update of /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/dmarf/asself_management In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12283/marf/net/assl/generatedbyassl/as/dmarf/asself_management Modified Files: Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION SELF_HEALING.java Log Message: Fix bad imports. Index: SELF_HEALING.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/dmarf/asself_management/Attic/SELF_HEALING.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** SELF_HEALING.java 30 Nov 2009 05:35:06 -0000 1.1.2.2 --- SELF_HEALING.java 23 Jul 2014 03:51:24 -0000 1.1.2.3 *************** *** 2,6 **** import java.io.Serializable; ! import generatedbyassl.as.ASSLPOLICY; /** --- 2,6 ---- import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.ASSLPOLICY; /** |
Update of /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/aes/stage_ae/aeself_management/self_healing In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12283/marf/net/assl/generatedbyassl/as/aes/stage_ae/aeself_management/self_healing Modified Files: Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION INACTIVESELFHEALING.java INFAILEDNODESDETECTED.java INPROBLEMATICNODESDETECTED.java Log Message: Fix bad imports. Index: INACTIVESELFHEALING.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/aes/stage_ae/aeself_management/self_healing/Attic/INACTIVESELFHEALING.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** INACTIVESELFHEALING.java 30 Nov 2009 05:35:05 -0000 1.1.2.2 --- INACTIVESELFHEALING.java 23 Jul 2014 03:51:23 -0000 1.1.2.3 *************** *** 2,6 **** import java.io.Serializable; ! import generatedbyassl.as.*; /** --- 2,6 ---- import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.*; /** Index: INPROBLEMATICNODESDETECTED.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/aes/stage_ae/aeself_management/self_healing/Attic/INPROBLEMATICNODESDETECTED.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** INPROBLEMATICNODESDETECTED.java 30 Nov 2009 05:35:05 -0000 1.1.2.2 --- INPROBLEMATICNODESDETECTED.java 23 Jul 2014 03:51:23 -0000 1.1.2.3 *************** *** 2,6 **** import java.io.Serializable; ! import generatedbyassl.as.*; /** --- 2,6 ---- import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.*; /** Index: INFAILEDNODESDETECTED.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/net/assl/generatedbyassl/as/aes/stage_ae/aeself_management/self_healing/Attic/INFAILEDNODESDETECTED.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** INFAILEDNODESDETECTED.java 30 Nov 2009 05:35:05 -0000 1.1.2.2 --- INFAILEDNODESDETECTED.java 23 Jul 2014 03:51:23 -0000 1.1.2.3 *************** *** 2,6 **** import java.io.Serializable; ! import generatedbyassl.as.*; /** --- 2,6 ---- import java.io.Serializable; ! import marf.net.assl.generatedbyassl.as.*; /** |
From: Serguei A. M. <mo...@us...> - 2013-01-09 17:15:09
|
Update of /cvsroot/marf/marf/doc/src/tex In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24110/marf/doc/src/tex Modified Files: Tag: INSE691A report.bib Log Message: Sync bib. Index: report.bib =================================================================== RCS file: /cvsroot/marf/marf/doc/src/tex/report.bib,v retrieving revision 1.18.4.19 retrieving revision 1.18.4.20 diff -C2 -d -r1.18.4.19 -r1.18.4.20 *** report.bib 27 Dec 2012 05:17:37 -0000 1.18.4.19 --- report.bib 9 Jan 2013 17:15:05 -0000 1.18.4.20 *************** *** 442,457 **** } @inproceedings { rlucid99, ! author = {Jean-Raymond Gagn\'e and John Plaice}, ! title = {Demand-Driven Real-Time Computing}, ! booktitle = {Intensional Programming II}, ! organization = {World Scientific}, ! year = 1999, [...1798 lines suppressed...] author = {Serguei A. Mokhov and Yankui Sun}, howpublished = {[online]}, ! year = {2011--2013}, note = {Online at \url{http://arxiv.org/abs/1204.6725}} } *************** *** 21293,21298 **** title = {{PRISM}: a probabilistic model checker}, howpublished = {[online]}, ! year = {2004--2012}, ! note = {\url{http://www.prismmodelchecker.org/}, last viewed June 2010} } --- 21936,21941 ---- title = {{PRISM}: a probabilistic model checker}, howpublished = {[online]}, ! year = {2004--2013}, ! note = {\url{http://www.prismmodelchecker.org/}, last viewed January 2013} } |
From: Serguei A. M. <mo...@us...> - 2012-12-27 05:20:03
|
Update of /cvsroot/marf/resources/stockbroker/doc/common In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32595/resources/stockbroker/doc/common Modified Files: Tag: INSE7120 bibliography.bib Log Message: Sync bib. Index: bibliography.bib =================================================================== RCS file: /cvsroot/marf/resources/stockbroker/doc/common/bibliography.bib,v retrieving revision 1.9.4.4 retrieving revision 1.9.4.5 diff -C2 -d -r1.9.4.4 -r1.9.4.5 *** bibliography.bib 4 Oct 2012 14:40:57 -0000 1.9.4.4 --- bibliography.bib 27 Dec 2012 05:20:00 -0000 1.9.4.5 *************** *** 78,81 **** --- 78,82 ---- @string{aw = "Addison-Wesley"} + @string{oreilly = "O'Reilly Media, Inc."} @string{ieee = "IEEE"} *************** *** 313,316 **** --- 314,330 ---- } [...1588 lines suppressed...] + year = 2004, + publisher = ieeecs, + isbn = {0-7695-2330-7}, + note = {\url{http://www.computer.org/portal/web/swebok/htmlformat}} + } %% *************** *** 19936,19940 **** month = mar, year = 2010, ! doi = {doi:10.1016/j.patcog.2010.03.004}, note = {} } --- 20525,20529 ---- month = mar, year = 2010, ! doi = {10.1016/j.patcog.2010.03.004}, note = {} } |
From: Serguei A. M. <mo...@us...> - 2012-12-27 05:20:02
|
Update of /cvsroot/marf/marf/doc/src/tex In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32595/marf/doc/src/tex Modified Files: Tag: INSE7120 report.bib Log Message: Sync bib. Index: report.bib =================================================================== RCS file: /cvsroot/marf/marf/doc/src/tex/report.bib,v retrieving revision 1.18.8.14 retrieving revision 1.18.8.15 diff -C2 -d -r1.18.8.14 -r1.18.8.15 *** report.bib 4 Oct 2012 14:40:56 -0000 1.18.8.14 --- report.bib 27 Dec 2012 05:19:59 -0000 1.18.8.15 *************** *** 78,81 **** --- 78,82 ---- @string{aw = "Addison-Wesley"} + @string{oreilly = "O'Reilly Media, Inc."} @string{ieee = "IEEE"} *************** *** 313,316 **** --- 314,330 ---- } [...1588 lines suppressed...] + year = 2004, + publisher = ieeecs, + isbn = {0-7695-2330-7}, + note = {\url{http://www.computer.org/portal/web/swebok/htmlformat}} + } %% *************** *** 19936,19940 **** month = mar, year = 2010, ! doi = {doi:10.1016/j.patcog.2010.03.004}, note = {} } --- 20525,20529 ---- month = mar, year = 2010, ! doi = {10.1016/j.patcog.2010.03.004}, note = {} } |
From: Serguei A. M. <mo...@us...> - 2012-12-27 05:18:50
|
Update of /cvsroot/marf/marf/doc/src/tex/common In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32520/marf/doc/src/tex/common Modified Files: Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION bibliography.bib Log Message: Sync bib. Index: bibliography.bib =================================================================== RCS file: /cvsroot/marf/marf/doc/src/tex/common/Attic/bibliography.bib,v retrieving revision 1.9.2.4 retrieving revision 1.9.2.5 diff -C2 -d -r1.9.2.4 -r1.9.2.5 *** bibliography.bib 4 Oct 2012 14:39:53 -0000 1.9.2.4 --- bibliography.bib 27 Dec 2012 05:18:47 -0000 1.9.2.5 *************** *** 78,81 **** --- 78,82 ---- @string{aw = "Addison-Wesley"} + @string{oreilly = "O'Reilly Media, Inc."} @string{ieee = "IEEE"} *************** *** 313,316 **** --- 314,330 ---- } [...1588 lines suppressed...] + year = 2004, + publisher = ieeecs, + isbn = {0-7695-2330-7}, + note = {\url{http://www.computer.org/portal/web/swebok/htmlformat}} + } %% *************** *** 19936,19940 **** month = mar, year = 2010, ! doi = {doi:10.1016/j.patcog.2010.03.004}, note = {} } --- 20525,20529 ---- month = mar, year = 2010, ! doi = {10.1016/j.patcog.2010.03.004}, note = {} } |
From: Serguei A. M. <mo...@us...> - 2012-12-27 05:18:49
|
Update of /cvsroot/marf/marf/doc/src/tex In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32520/marf/doc/src/tex Modified Files: Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION report.bib Log Message: Sync bib. Index: report.bib =================================================================== RCS file: /cvsroot/marf/marf/doc/src/tex/report.bib,v retrieving revision 1.18.6.15 retrieving revision 1.18.6.16 diff -C2 -d -r1.18.6.15 -r1.18.6.16 *** report.bib 4 Oct 2012 14:39:53 -0000 1.18.6.15 --- report.bib 27 Dec 2012 05:18:46 -0000 1.18.6.16 *************** *** 78,81 **** --- 78,82 ---- @string{aw = "Addison-Wesley"} + @string{oreilly = "O'Reilly Media, Inc."} @string{ieee = "IEEE"} *************** *** 313,316 **** --- 314,330 ---- } [...1588 lines suppressed...] + year = 2004, + publisher = ieeecs, + isbn = {0-7695-2330-7}, + note = {\url{http://www.computer.org/portal/web/swebok/htmlformat}} + } %% *************** *** 19936,19940 **** month = mar, year = 2010, ! doi = {doi:10.1016/j.patcog.2010.03.004}, note = {} } --- 20525,20529 ---- month = mar, year = 2010, ! doi = {10.1016/j.patcog.2010.03.004}, note = {} } |
From: Serguei A. M. <mo...@us...> - 2012-12-27 05:18:23
|
Update of /cvsroot/marf/resources/stockbroker/doc/common In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32501/resources/stockbroker/doc/common Modified Files: bibliography.bib Log Message: Sync bib. Index: bibliography.bib =================================================================== RCS file: /cvsroot/marf/resources/stockbroker/doc/common/bibliography.bib,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** bibliography.bib 4 Oct 2012 14:45:55 -0000 1.13 --- bibliography.bib 27 Dec 2012 05:18:20 -0000 1.14 *************** *** 78,81 **** --- 78,82 ---- @string{aw = "Addison-Wesley"} + @string{oreilly = "O'Reilly Media, Inc."} @string{ieee = "IEEE"} *************** *** 313,316 **** --- 314,330 ---- } [...1588 lines suppressed...] + year = 2004, + publisher = ieeecs, + isbn = {0-7695-2330-7}, + note = {\url{http://www.computer.org/portal/web/swebok/htmlformat}} + } %% *************** *** 19936,19940 **** month = mar, year = 2010, ! doi = {doi:10.1016/j.patcog.2010.03.004}, note = {} } --- 20525,20529 ---- month = mar, year = 2010, ! doi = {10.1016/j.patcog.2010.03.004}, note = {} } |
From: Serguei A. M. <mo...@us...> - 2012-12-27 05:17:40
|
Update of /cvsroot/marf/marf/doc/src/tex In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32439/marf/doc/src/tex Modified Files: Tag: INSE691A report.bib Log Message: Sync bib. Index: report.bib =================================================================== RCS file: /cvsroot/marf/marf/doc/src/tex/report.bib,v retrieving revision 1.18.4.18 retrieving revision 1.18.4.19 diff -C2 -d -r1.18.4.18 -r1.18.4.19 *** report.bib 4 Oct 2012 14:45:16 -0000 1.18.4.18 --- report.bib 27 Dec 2012 05:17:37 -0000 1.18.4.19 *************** *** 78,81 **** --- 78,82 ---- @string{aw = "Addison-Wesley"} + @string{oreilly = "O'Reilly Media, Inc."} @string{ieee = "IEEE"} *************** *** 313,316 **** --- 314,330 ---- } [...1588 lines suppressed...] + year = 2004, + publisher = ieeecs, + isbn = {0-7695-2330-7}, + note = {\url{http://www.computer.org/portal/web/swebok/htmlformat}} + } %% *************** *** 19936,19940 **** month = mar, year = 2010, ! doi = {doi:10.1016/j.patcog.2010.03.004}, note = {} } --- 20525,20529 ---- month = mar, year = 2010, ! doi = {10.1016/j.patcog.2010.03.004}, note = {} } |
From: Serguei A. M. <mo...@us...> - 2012-10-04 14:45:58
|
Update of /cvsroot/marf/resources/stockbroker/doc/common In directory vz-cvs-4.sog:/tmp/cvs-serv7638/resources/stockbroker/doc/common Modified Files: bibliography.bib Log Message: Sync bib. Index: bibliography.bib =================================================================== RCS file: /cvsroot/marf/resources/stockbroker/doc/common/bibliography.bib,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** bibliography.bib 1 Jan 2012 22:33:20 -0000 1.12 --- bibliography.bib 4 Oct 2012 14:45:55 -0000 1.13 *************** *** 28,31 **** --- 28,32 ---- %% Joey Paquet %% Amir H. Pourteymour + %% Sleiman Rabah %% Farid Rassai %% Simone Richard *************** *** 193,196 **** --- 194,208 ---- } [...3870 lines suppressed...] + howpublished = {[online]}, + note = {Submitted for publication to EMBC2012. + online at \url{http://arxiv.org/abs/1204.6385}} + } + %% *************** *** 19574,19578 **** title = {{PRISM}: a probabilistic model checker}, howpublished = {[online]}, ! year = {2004--2011}, note = {\url{http://www.prismmodelchecker.org/}, last viewed June 2010} } --- 20704,20708 ---- title = {{PRISM}: a probabilistic model checker}, howpublished = {[online]}, ! year = {2004--2012}, note = {\url{http://www.prismmodelchecker.org/}, last viewed June 2010} } |
From: Serguei A. M. <mo...@us...> - 2012-10-04 14:45:57
|
Update of /cvsroot/marf/marf/doc/src/tex In directory vz-cvs-4.sog:/tmp/cvs-serv7638/marf/doc/src/tex Modified Files: report.bib Log Message: Sync bib. Index: report.bib =================================================================== RCS file: /cvsroot/marf/marf/doc/src/tex/report.bib,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** report.bib 1 Jan 2012 22:33:20 -0000 1.33 --- report.bib 4 Oct 2012 14:45:55 -0000 1.34 *************** *** 28,31 **** --- 28,32 ---- %% Joey Paquet %% Amir H. Pourteymour + %% Sleiman Rabah %% Farid Rassai %% Simone Richard *************** *** 193,196 **** --- 194,208 ---- } [...3870 lines suppressed...] + howpublished = {[online]}, + note = {Submitted for publication to EMBC2012. + online at \url{http://arxiv.org/abs/1204.6385}} + } + %% *************** *** 19574,19578 **** title = {{PRISM}: a probabilistic model checker}, howpublished = {[online]}, ! year = {2004--2011}, note = {\url{http://www.prismmodelchecker.org/}, last viewed June 2010} } --- 20704,20708 ---- title = {{PRISM}: a probabilistic model checker}, howpublished = {[online]}, ! year = {2004--2012}, note = {\url{http://www.prismmodelchecker.org/}, last viewed June 2010} } |
From: Serguei A. M. <mo...@us...> - 2012-10-04 14:45:21
|
Update of /cvsroot/marf/marf/doc/src/tex In directory vz-cvs-4.sog:/tmp/cvs-serv7603/marf/doc/src/tex Modified Files: Tag: INSE691A report.bib Log Message: Sync bib. Index: report.bib =================================================================== RCS file: /cvsroot/marf/marf/doc/src/tex/report.bib,v retrieving revision 1.18.4.17 retrieving revision 1.18.4.18 diff -C2 -d -r1.18.4.17 -r1.18.4.18 *** report.bib 1 Jan 2012 22:32:54 -0000 1.18.4.17 --- report.bib 4 Oct 2012 14:45:16 -0000 1.18.4.18 *************** *** 28,31 **** --- 28,32 ---- %% Joey Paquet %% Amir H. Pourteymour + %% Sleiman Rabah %% Farid Rassai %% Simone Richard *************** *** 193,196 **** --- 194,208 ---- } [...3870 lines suppressed...] + howpublished = {[online]}, + note = {Submitted for publication to EMBC2012. + online at \url{http://arxiv.org/abs/1204.6385}} + } + %% *************** *** 19574,19578 **** title = {{PRISM}: a probabilistic model checker}, howpublished = {[online]}, ! year = {2004--2011}, note = {\url{http://www.prismmodelchecker.org/}, last viewed June 2010} } --- 20704,20708 ---- title = {{PRISM}: a probabilistic model checker}, howpublished = {[online]}, ! year = {2004--2012}, note = {\url{http://www.prismmodelchecker.org/}, last viewed June 2010} } |