Skip to content

Commit

Permalink
fixed Description and DevelopmentStatus for CNN and DVSFramer classes
Browse files Browse the repository at this point in the history
  • Loading branch information
tobidelbruck committed Jan 15, 2018
1 parent b1cf6d9 commit fbd6401
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import javax.swing.SwingUtilities;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
import net.sf.jaer.Description;
import net.sf.jaer.DevelopmentStatus;
import net.sf.jaer.chip.AEChip;
import net.sf.jaer.event.BasicEvent;
import net.sf.jaer.event.EventPacket;
Expand All @@ -56,6 +58,8 @@
*
* @author Tobi
*/
@Description("Abstract super class for running CNNs from DAVIS cameras")
@DevelopmentStatus(DevelopmentStatus.Status.Experimental)
public abstract class AbstractDavisCNNProcessor extends EventFilter2D implements FrameAnnotater, PropertyChangeListener {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
*
*/
@Description("using data-driven ROIs from DVS events to update heat map by running CNN on each filled ROI")
@DevelopmentStatus(DevelopmentStatus.Status.InDevelopment)
@DevelopmentStatus(DevelopmentStatus.Status.Experimental)
public class DavisWhatWhereCNNProcessor extends AbstractDavisCNNProcessor {

public static final String OUTPUT_AVAILBLE = "outputUpdated";
Expand Down
4 changes: 4 additions & 0 deletions src/ch/unizh/ini/jaer/projects/npp/DvsFramer.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import net.sf.jaer.Description;
import net.sf.jaer.DevelopmentStatus;
import net.sf.jaer.chip.AEChip;
import net.sf.jaer.event.BasicEvent;
import net.sf.jaer.event.EventPacket;
Expand Down Expand Up @@ -61,6 +63,8 @@
* @see #EVENT_NEW_FRAME_AVAILABLE
*
*/
@Description("Abstract super class for making DVS frames from DVS events")
@DevelopmentStatus(DevelopmentStatus.Status.Experimental)
abstract public class DvsFramer extends EventFilter2D {

protected static Logger log = Logger.getLogger("DvsFramer");
Expand Down
15 changes: 4 additions & 11 deletions src/ch/unizh/ini/jaer/projects/npp/DvsFramerROIGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,21 @@
*/
package ch.unizh.ini.jaer.projects.npp;

import com.jogamp.opengl.GL;
import com.jogamp.opengl.GL2;
import com.jogamp.opengl.GLAutoDrawable;
import com.jogamp.opengl.GLException;
import eu.visualize.ini.convnet.DeepLearnCnnNetwork_HJ;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Random;
import java.util.Timer;
import java.util.TimerTask;
import javax.swing.BoxLayout;
import javax.swing.JFrame;
import javax.swing.JPanel;
import net.sf.jaer.Description;
import net.sf.jaer.DevelopmentStatus;
import net.sf.jaer.chip.AEChip;
import net.sf.jaer.event.BasicEvent;
import net.sf.jaer.event.EventPacket;
import net.sf.jaer.event.PolarityEvent;
import net.sf.jaer.eventprocessing.EventFilter2D;
import net.sf.jaer.graphics.FrameAnnotater;
import net.sf.jaer.graphics.ImageDisplay;
import net.sf.jaer.util.DrawGL;

/**
Expand All @@ -50,6 +41,8 @@
*
* @author Tobi Delbruck
*/
@Description("Makes data-driven regions of interest DVS frames from DVS events")
@DevelopmentStatus(DevelopmentStatus.Status.Experimental)
public class DvsFramerROIGenerator extends DvsFramer implements FrameAnnotater {

/**
Expand Down
4 changes: 4 additions & 0 deletions src/ch/unizh/ini/jaer/projects/npp/DvsFramerSingleFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
package ch.unizh.ini.jaer.projects.npp;

import eu.visualize.ini.convnet.DeepLearnCnnNetwork_HJ;
import net.sf.jaer.Description;
import net.sf.jaer.DevelopmentStatus;
import net.sf.jaer.chip.AEChip;
import net.sf.jaer.event.BasicEvent;
import net.sf.jaer.event.EventPacket;
Expand All @@ -37,6 +39,8 @@
*
* @author Tobi
*/
@Description("Makes single DVS frames from DVS events")
@DevelopmentStatus(DevelopmentStatus.Status.Experimental)
public class DvsFramerSingleFrame extends DvsFramer {

protected DvsFrame dvsFrame = null;
Expand Down

0 comments on commit fbd6401

Please sign in to comment.